From: Nick Clifton <nickc@redhat.com>
Date: Fri, 2 Dec 2016 16:41:14 +0000 (+0000)
Subject: Fix seg-fault in the linker when examining a corrupt binary.
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=531336e3a0b79ed60cfc36ad2d6579b6a71175da;p=deliverable%2Fbinutils-gdb.git

Fix seg-fault in the linker when examining a corrupt binary.

	PR ld/20909
	* aoutx.h (aout_link_add_symbols): Fix off-by-one error in check
	for an illegal string offset.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d061e66a26..c8085e7b42 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-02  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/20909
+	* aoutx.h (aout_link_add_symbols): Fix off-by-one error in check
+	for an illegal string offset.
+
 2016-12-02  Gary Benson  <gbenson@redhat.com>
 
 	* elf.c (_bfd_elf_make_section_from_shdr): Pass offset to
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 4308679207..b9ac2b7f9e 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -3031,10 +3031,9 @@ aout_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
 	continue;
 
       /* PR 19629: Corrupt binaries can contain illegal string offsets.  */
-      if (GET_WORD (abfd, p->e_strx) > obj_aout_external_string_size (abfd))
+      if (GET_WORD (abfd, p->e_strx) >= obj_aout_external_string_size (abfd))
 	return FALSE;
       name = strings + GET_WORD (abfd, p->e_strx);
-      
       value = GET_WORD (abfd, p->e_value);
       flags = BSF_GLOBAL;
       string = NULL;