diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2489eda2de..fd2c5d89fc 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-16  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (elf_find_function): Fail if not provided with a symbol
+	table.
+
 2011-06-15  Ulrich Weigand  <ulrich.weigand@linaro.org>
 
 	* elf-bfd.h (elfcore_write_arm_vfp): Add prototype.
diff --git a/bfd/elf.c b/bfd/elf.c
index 15e0cd34f6..15e9087c80 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -7391,6 +7391,9 @@ elf_find_function (bfd *abfd,
   enum { nothing_seen, symbol_seen, file_after_symbol_seen } state;
   const struct elf_backend_data *bed = get_elf_backend_data (abfd);
 
+  if (symbols == NULL)
+    return FALSE;
+
   filename = NULL;
   func = NULL;
   file = NULL;