Fix abort when running tools on a bogus binary.

	PR binutils/20907
	* peicode.h (pe_ILF_build_a_bfd): Replace abort with error return.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7388bb2..8dc48b3 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -5,6 +5,9 @@
 
 2016-12-05  Nick Clifton  <nickc@redhat.com>
 
+       PR binutils/20907
+       * peicode.h (pe_ILF_build_a_bfd): Replace abort with error return.
+
        PR binutils/20921
        * aoutx.h (squirt_out_relocs): Check for and report any relocs
        that could not be recognised.

diff --git a/bfd/peicode.h b/bfd/peicode.h
index 9f98f86..ee47a67 100644 (file)
--- a/bfd/peicode.h
+++ b/bfd/peicode.h
@@ -892,8 +892,8 @@ pe_ILF_build_a_bfd (bfd *           abfd,
   if (import_name_type == IMPORT_ORDINAL)
     {
       if (ordinal == 0)
-       /* XXX - treat as IMPORT_NAME ??? */
-       abort ();
+       /* See PR 20907 for a reproducer.  */
+       goto error_return;
 
 #ifdef COFF_WITH_pex64
       ((unsigned int *) id4->contents)[0] = ordinal;