From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Thu, 14 Mar 2013 14:43:25 +0000 (+0000)
Subject: gdb/
X-Git-Tag: gdb_7_6-2013-04-26-release~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ccd09cea7785f20f788ee85e48123f10fa89310;p=thirdparty%2Fbinutils-gdb.git

gdb/
	* source.c (print_source_lines_base): Make a local copy of
	symtab_to_fullname.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9d631d27346..8fceeeadad0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* source.c (print_source_lines_base): Make a local copy of
+	symtab_to_fullname.
+
 2013-03-14  Hui Zhu  <hui_zhu@mentor.com>
 	    Jan Kratochvil  <jan.kratochvil@redhat.com>
 
diff --git a/gdb/source.c b/gdb/source.c
index b154dfe6177..2d9410ecc37 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1355,11 +1355,18 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
 				 symtab_to_filename_for_display (s));
 	  if (ui_out_is_mi_like_p (uiout)
 	      || !ui_out_test_flags (uiout, ui_source_list))
-	    {
-	      const char *fullname = symtab_to_fullname (s);
-
-	      ui_out_field_string (uiout, "fullname", fullname);
-	    }
+ 	    {
+	      const char *s_fullname = symtab_to_fullname (s);
+	      char *local_fullname;
+
+	      /* ui_out_field_string may free S_FULLNAME by calling
+		 open_source_file for it again.  See e.g.,
+		 tui_field_string->tui_show_source.  */
+	      local_fullname = alloca (strlen (s_fullname) + 1);
+	      strcpy (local_fullname, s_fullname);
+
+	      ui_out_field_string (uiout, "fullname", local_fullname);
+ 	    }
 
 	  ui_out_text (uiout, "\n");
 	}