From: Nick Clifton <nickc@redhat.com>
Date: Mon, 5 Dec 2016 12:14:22 +0000 (+0000)
Subject: Fix assertion failure in linker triggered by corrupt input file.
X-Git-Tag: users/ARM/embedded-binutils-2_28-branch-2017q1~301
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39d4daf68e696bbf2db417abe677b2e68f3aace9;p=external%2Fbinutils.git

Fix assertion failure in linker triggered by corrupt input file.

	PR ld/20925
	* aoutx.h (aout_link_add_symbols): Replace BFD_ASSERT with return
	FALSE.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 45b8b88..dbb90e7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-05  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/20925
+	* aoutx.h (aout_link_add_symbols): Replace BFD_ASSERT with return
+	FALSE.
+
 2016-12-03  Alan Modra  <amodra@gmail.com>
 
 	* elf64-ppc.c (struct ppc_link_hash_entry): Delete "was_undefined".
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index b9ac2b7..fb7041a 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -3089,7 +3089,9 @@ aout_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
 	case N_INDR | N_EXT:
 	  /* An indirect symbol.  The next symbol is the symbol
 	     which this one really is.  */
-	  BFD_ASSERT (p + 1 < pend);
+	  /* See PR 20925 for a reproducer.  */
+	  if (p + 1 >= pend)
+	    return FALSE;
 	  ++p;
 	  /* PR 19629: Corrupt binaries can contain illegal string offsets.  */
 	  if (GET_WORD (abfd, p->e_strx) > obj_aout_external_string_size (abfd))