2005-12-02 Andrew Stubbs <andrew.stubbs@st.com>

	* symfile.c (symbol_file_clear): Test symfile_objfile is not NULL
	before dereferencing it.
	Gettextize the query.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d9fdbbc..b4ad773 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-02  Andrew Stubbs  <andrew.stubbs@st.com>
+
+       * symfile.c (symbol_file_clear): Test symfile_objfile is not NULL
+       before dereferencing it.
+       Gettextize the query.
+
 2005-12-02  Joel Brobecker  <brobecker@adacore.com>
 
        GDB 6.4 released from GDB 6.4 branch.

diff --git a/gdb/symfile.c b/gdb/symfile.c
index ddd198d..5194e45 100644 (file)
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1085,8 +1085,10 @@ symbol_file_clear (int from_tty)
 {
   if ((have_full_symbols () || have_partial_symbols ())
       && from_tty
-      && !query ("Discard symbol table from `%s'? ",
-                symfile_objfile->name))
+      && (symfile_objfile
+         ? !query (_("Discard symbol table from `%s'? "),
+                   symfile_objfile->name)
+         : !query (_("Discard symbol table? "))))
     error (_("Not confirmed."));
     free_all_objfiles ();