diff options
| author | DJ Delorie <dj@redhat.com> | 2014-05-20 15:42:23 -0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2014-05-20 15:42:23 -0400 |
| commit | bceec4b91193a4485f94c1fe56e20bc755674e59 (patch) | |
| tree | 598148413db61273da7376d21146f5e1a5f042b3 /bfd | |
| parent | 936d299246c2be32cfc92e0ad824f31d5b8cec73 (diff) | |
| download | gdb-bceec4b91193a4485f94c1fe56e20bc755674e59.zip gdb-bceec4b91193a4485f94c1fe56e20bc755674e59.tar.gz gdb-bceec4b91193a4485f94c1fe56e20bc755674e59.tar.bz2 | |
* elf32-msp430.c (msp430_elf_relax_adjust_locals): Avoid overflow.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/elf32-msp430.c | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5d15e64..c674220 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2014-05-20 DJ Delorie <dj@redhat.com> + + * elf32-msp430.c (msp430_elf_relax_adjust_locals): Avoid overflow. + 2014-05-20 Alan Modra <amodra@gmail.com> PR 16952 diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c index c2d168c..2f55c53 100644 --- a/bfd/elf32-msp430.c +++ b/bfd/elf32-msp430.c @@ -1582,14 +1582,15 @@ msp430_elf_relax_adjust_locals (bfd * abfd, asection * sec, bfd_vma addr, irelend = irel + sec->reloc_count; symtab_hdr = & elf_tdata (abfd)->symtab_hdr; isym = (Elf_Internal_Sym *) symtab_hdr->contents; - + for (;irel < irelend; irel++) { - int sidx = ELF32_R_SYM(irel->r_info); + unsigned int sidx = ELF32_R_SYM(irel->r_info); Elf_Internal_Sym *lsym = isym + sidx; - + /* Adjust symbols referenced by .sec+0xXX */ - if (irel->r_addend > addr && irel->r_addend < toaddr + if (irel->r_addend > addr && irel->r_addend < toaddr + && sidx < symtab_hdr->sh_info && lsym->st_shndx == sec_shndx) irel->r_addend -= count; } |