From f725daa870859ce411549931f9d7fe36e8371a07 Mon Sep 17 00:00:00 2001
From: Cary Coutant <ccoutant@google.com>
Date: Thu, 26 Jul 2012 18:20:39 +0000
Subject: [PATCH] 2012-07-26  Teresa Johnson  <tejohnson@google.com>

	* bfd/dwarf2.c (find_line): Initialize discriminator_ptr
	if it is non-NULL.
---
 bfd/ChangeLog | 5 +++++
 bfd/dwarf2.c  | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d350f0cdd50..96b8e51d07c 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 069d6141a77..a4dc52b278c 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))
-- 
2.30.2