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 d061e66a2609f875ff444c6b5bf64675f03cc435..c8085e7b42c79619b59daf2d3bc37eabb70c318d 100644 (file)
--- 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 4308679207d4b0d16892b8c1cefe94b98f050edd..b9ac2b7f9e56051e1aa9d87bf4a12ba6e736d65d 100644 (file)
--- 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;