OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR25675: SIGSEGV in bfd_octets_per_byte 

PR 25675
	* elf.c (elf_sort_segments): Don't call bfd_octets_per_byte unless
	we have a non-zero section count.  Do lma comparison in octets.
This commit is contained in:
Alan Modra 2020-03-16 19:34:00 +10:30
parent 28d1356774
commit 4b3ecb3b91
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2020-03-16 Alan Modra <amodra@gmail.com>
PR 25675
* elf.c (elf_sort_segments): Don't call bfd_octets_per_byte unless
we have a non-zero section count. Do lma comparison in octets.
2020-03-16 Alan Modra <amodra@gmail.com>
* vms-alpha.c (dst_restore_location): Validate index into

20
bfd/elf.c
View File

@ -5312,19 +5312,25 @@ elf_sort_segments (const void *arg1, const void *arg2)
return m1->no_sort_lma ? -1 : 1;
if (m1->p_type == PT_LOAD && !m1->no_sort_lma)
{
unsigned int opb = bfd_octets_per_byte (m1->sections[0]->owner,
m1->sections[0]);
bfd_vma lma1, lma2; /* Bytes. */
bfd_vma lma1, lma2; /* Octets. */
lma1 = 0;
if (m1->p_paddr_valid)
lma1 = m1->p_paddr / opb;
lma1 = m1->p_paddr;
else if (m1->count != 0)
lma1 = m1->sections[0]->lma + m1->p_vaddr_offset;
{
unsigned int opb = bfd_octets_per_byte (m1->sections[0]->owner,
m1->sections[0]);
lma1 = (m1->sections[0]->lma + m1->p_vaddr_offset) * opb;
}
lma2 = 0;
if (m2->p_paddr_valid)
lma2 = m2->p_paddr / opb;
lma2 = m2->p_paddr;
else if (m2->count != 0)
lma2 = m2->sections[0]->lma + m2->p_vaddr_offset;
{
unsigned int opb = bfd_octets_per_byte (m2->sections[0]->owner,
m2->sections[0]);
lma2 = (m2->sections[0]->lma + m2->p_vaddr_offset) * opb;
}
if (lma1 != lma2)
return lma1 < lma2 ? -1 : 1;
}