From: Nick Clifton <nickc@redhat.com>
Date: Fri, 31 Oct 2014 10:24:58 +0000 (+0000)
Subject: Import a patch from the mainline to fix a seg-fault in the BFD library:
X-Git-Tag: binutils-2_25~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5278f3dd9f3bfa44af7348fd6687a78692aafbfb;p=thirdparty%2Fbinutils-gdb.git

Import a patch from the mainline to fix a seg-fault in the BFD library:

	PR binutils/17512
	* ihex.c (ihex_scan): Fix typo in invocation of ihex_bad_byte.
	* coffgen.c (coff_get_normalized_symtab): Prevent buffer overrun.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bbcb3454165..efcaa367121 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+2014-10-31  Nick Clifton  <nickc@redhat.com>
+
+	Apply trunk patch:
+
+	2014-10-30  Nick Clifton  <nickc@redhat.com>
+	PR binutils/17512
+	* ihex.c (ihex_scan): Fix typo in invocation of ihex_bad_byte.
+	* coffgen.c (coff_get_normalized_symtab): Prevent buffer overrun.
+
 2014-10-30  Nick Clifton  <nickc@redhat.com>
 
 	Appy trunk patch:
diff --git a/bfd/ihex.c b/bfd/ihex.c
index 8d3590d670e..9b3b8138798 100644
--- a/bfd/ihex.c
+++ b/bfd/ihex.c
@@ -321,7 +321,7 @@ ihex_scan (bfd *abfd)
 	    {
 	      if (! ISHEX (buf[i]))
 		{
-		  ihex_bad_byte (abfd, lineno, hdr[i], error);
+		  ihex_bad_byte (abfd, lineno, buf[i], error);
 		  goto error_return;
 		}
 	    }