From: DJ Delorie <dj@redhat.com>
Date: Tue, 20 May 2014 19:42:23 +0000 (-0400)
Subject: * elf32-msp430.c (msp430_elf_relax_adjust_locals): Avoid overflow.
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=bceec4b91193a4485f94c1fe56e20bc755674e59;p=deliverable%2Fbinutils-gdb.git

* elf32-msp430.c (msp430_elf_relax_adjust_locals): Avoid overflow.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5d15e645da..c674220f61 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 c2d168c50d..2f55c538dd 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;
     }