summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2004-04-16 09:25:01 +0000
committerNick Clifton <nickc@redhat.com>2004-04-16 09:25:01 +0000
commit5aeb5c7aedcad0778be43d8bb2ccacaa5c6f7e32 (patch)
treefc5680f33e8fb8545dcf033de0f456783e589bca
parent94257ed064240665bce5ed15d239ab96264b374b (diff)
downloadgdb-5aeb5c7aedcad0778be43d8bb2ccacaa5c6f7e32.tar.gz
Prevent bfd_archive_filename() from segfaulting on NULL input
-rw-r--r--bfd/ChangeLog4
-rw-r--r--bfd/bfd.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a895cf82235..7697eccf296 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-16 Nick Clifton <nickc@redhat.com>
+
+ * bfd.c (bfd_archive_filename): Catch NULL bfd pointers.
+
2004-04-16 H.J. Lu <hongjiu.lu@intel.com>
* elflink.c (_bfd_elf_merge_symbol): Treat weak as strong only
diff --git a/bfd/bfd.c b/bfd/bfd.c
index d37a48bc23b..59e22aaed8d 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -512,6 +512,9 @@ DESCRIPTION
const char *
bfd_archive_filename (bfd *abfd)
{
+ if (abfd == NULL)
+ return _("<unknown>");
+
if (abfd->my_archive)
{
static size_t curr = 0;