diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f794727742..8a84296e83 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-11  Andrew Haley  <aph@cambridge.redhat.com>
+
+	* elf.c (_bfd_elf_find_nearest_line): Check functionname_ptr and
+	line_ptr before deciding we've found a symbol.
+
 2002-09-11  Nick Clifton  <nickc@redhat.com>
 
 	* po/da.po: New Danish translation file.
diff --git a/bfd/elf.c b/bfd/elf.c
index 71763d41be..7f54909af9 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -6041,7 +6041,7 @@ _bfd_elf_find_nearest_line (abfd, section, symbols, offset,
 					     functionname_ptr, line_ptr,
 					     &elf_tdata (abfd)->line_info))
     return false;
-  if (found)
+  if (found && (*functionname_ptr || *line_ptr))
     return true;
 
   if (symbols == NULL)