svn commit: r326382 - stable/10/contrib/binutils/bfd

[Ed Maste]

Author: emaste
Date: Thu Nov 30 00:27:49 2017
New Revision: 326382
URL: https://svnweb.freebsd.org/changeset/base/326382

Log:
  MFC r326135: bfd: fix segfault in the ihex parser on malformed ihex file
  
  From binutils commit 0102ea8cec5fc509bba6c91df61b7ce23a799d32, made
  available under GPLv2 by Nick Clifton.
  
  PR:		198824
  Security:	CVE-2014-8503

Modified:
  stable/10/contrib/binutils/bfd/ihex.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/binutils/bfd/ihex.c
==============================================================================
--- stable/10/contrib/binutils/bfd/ihex.c	Thu Nov 30 00:26:45 2017	(r326381)
+++ stable/10/contrib/binutils/bfd/ihex.c	Thu Nov 30 00:27:49 2017	(r326382)
@@ -320,7 +320,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;
 		}
 	    }