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 bbcb345..efcaa36 100644 (file)
--- 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 8d3590d..9b3b813 100644 (file)
--- 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;
                }
            }