diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d350f0cdd5..96b8e51d07 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-26  Teresa Johnson  <tejohnson@google.com>
+
+	* bfd/dwarf2.c (find_line): Initialize discriminator_ptr
+	if it is non-NULL.
+
 2012-07-26  Meador Inge  <meadori@codesourcery.com>
 	    Nick Clifton  <nickc@redhat.com>
 
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 069d6141a7..a4dc52b278 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -3344,6 +3344,8 @@ find_line (bfd *abfd,
   if (functionname_ptr != NULL)
     *functionname_ptr = NULL;
   *linenumber_ptr = 0;
+  if (discriminator_ptr)
+    *discriminator_ptr = 0;
 
   if (! _bfd_dwarf2_slurp_debug_info (abfd, NULL,
 				      debug_sections, symbols, pinfo))