[PATCH] fix symbol-file crash

[PATCH] fix symbol-file crash

[Andrew STUBBS]

[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]

Hi,

The attached patch fixes a bug which causes a crash clearing the symbol 
tables.

The problem occurs as follows:

(gdb) add-symbol-file ~/hello
add symbol table from file "/home/afra/users/stubbsa/hello" at
(y or n) y
Reading symbols from /home/afra/users/stubbsa/hello...done.
Using host libthread_db library "/lib/tls/libthread_db.so.1".
(gdb) symbol-file
Segmentation fault

The problem does not occur when the commands are executed from a script.

The cause is symbol-file asking permission to clear the symbol tables 
using the name of the object file without first checking there is an 
object file. If symbol-file was used to load the symbols then all is 
well. If add-symbol-file was used (which seems to work equally well in 
all other ways) then there is no main object file and it all goes 
horribly wrong.

Note that this is the second problem mentioned in bug #858 and also in 
bug #878, which appears to be a duplicate.

I have fixed this by testing the pointer before dereferencing it and 
using '<unknown>' if there is no object file name. Perhaps there is 
something more intelligent that could be done here, but this fixes the 
problem at hand.

I have also added a missing _() to the query string.

Andrew Stubbs

[-- Attachment #2: symbol-file.patch --]
[-- Type: text/plain, Size: 781 bytes --]

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

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

Index: src/gdb/symfile.c
===================================================================
--- src.orig/gdb/symfile.c	2005-12-01 12:05:58.000000000 +0000
+++ src/gdb/symfile.c	2005-12-01 15:21:17.000000000 +0000
@@ -1085,8 +1085,8 @@ symbol_file_clear (int from_tty)
 {
   if ((have_full_symbols () || have_partial_symbols ())
       && from_tty
-      && !query ("Discard symbol table from `%s'? ",
-		 symfile_objfile->name))
+      && !query (_("Discard symbol table from `%s'? "),
+		 symfile_objfile ? symfile_objfile->name : _("<unknown>")))
     error (_("Not confirmed."));
     free_all_objfiles ();
 

Re: [PATCH] fix symbol-file crash

[Jim Blandy]

I think this is obvious; please go ahead and commit it.

However, instead of using <unknown> when symfile_objfile is NULL, just
use two distinct prompt strings: "Discard symbol table from `%s'? "
and "Discard symbol table? ".

Re: [PATCH] fix symbol-file crash

[Andrew STUBBS]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

Jim Blandy wrote:
> I think this is obvious; please go ahead and commit it.
> 
> However, instead of using <unknown> when symfile_objfile is NULL, just
> use two distinct prompt strings: "Discard symbol table from `%s'? "
> and "Discard symbol table? ".

Thanks I committed the attached.

Andrew

[-- Attachment #2: symbol-file.patch --]
[-- Type: text/plain, Size: 817 bytes --]

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.

Index: src/gdb/symfile.c
===================================================================
--- src.orig/gdb/symfile.c	2005-12-01 17:35:14.000000000 +0000
+++ src/gdb/symfile.c	2005-12-02 10:49:45.000000000 +0000
@@ -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 ();