2 files changed, 7 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4c4a541..5bd1d74 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-15  Nick Clifton  <nickc@redhat.com>
+
+	* bfd.c (bfd_archive_filename): Catch NULL bfd pointers.
+
 2004-04-15  Alan Modra  <amodra@bigpond.net.au>
 
 	* elf64-sparc.c (sparc64_elf_check_relocs): Fix thinko last change.
diff --git a/bfd/bfd.c b/bfd/bfd.c
index d37a48b..59e22aa 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;