aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2016-12-05 14:59:02 +0000
committerNick Clifton <nickc@redhat.com>2016-12-05 14:59:02 +0000
commit52c4f3bdd5957a31b671a9791f462be5e8eadd85 (patch)
tree87d292f55187294d3b45f0fd1b5ac2fc2a18d2d1
parente2996cc315d6ea242e1a954dc20246485ccc8512 (diff)
downloadgdb-52c4f3bdd5957a31b671a9791f462be5e8eadd85.zip
gdb-52c4f3bdd5957a31b671a9791f462be5e8eadd85.tar.gz
gdb-52c4f3bdd5957a31b671a9791f462be5e8eadd85.tar.bz2
Fix abort when running tools on a bogus binary.
PR binutils/20907 * peicode.h (pe_ILF_build_a_bfd): Replace abort with error return.
-rw-r--r--bfd/ChangeLog3
-rw-r--r--bfd/peicode.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7388bb2..8dc48b3 100644
--- 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
--- 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;