diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 81a8fd487e..a90b270cfa 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-19  Doug Kwan  <dougkwan@google.com>
+
+       PR binutils/4797
+       * dwarf2.c: (find_line) Do not dereference functionname_ptr if
+       do_line is true.
+
 2007-07-18  Bob Wilson  <bob.wilson@acm.org>
 	
 	* elf32-xtensa.c (xtensa_callback_required_dependence): Ignore
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 87bee39274..bcaebc2b88 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -2380,7 +2380,8 @@ find_line (bfd *abfd,
   else
     addr += section->vma;
   *filename_ptr = NULL;
-  *functionname_ptr = NULL;
+  if (! do_line)
+    *functionname_ptr = NULL;
   *linenumber_ptr = 0;
 
   if (! *pinfo)