diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b51de1fcc9..538436d4bb 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,8 @@
 2007-07-26  Michael Snyder  <msnyder@access-company.com>
 
+	* linker.c (already_linked_newfunc): Check for NULL return from
+	bfd_hash_allocate.
+
 	* coffgen.c (fixup_symbol_value): Guard against null; 
 	bfd_is_com_section will dereference the section pointer.
 
diff --git a/bfd/linker.c b/bfd/linker.c
index f547a752a1..d31752be37 100644
--- a/bfd/linker.c
+++ b/bfd/linker.c
@@ -2948,6 +2948,9 @@ already_linked_newfunc (struct bfd_hash_entry *entry ATTRIBUTE_UNUSED,
 
   ret->entry = NULL;
 
+  if (ret == NULL)
+    return ret;
+
   return &ret->root;
 }