Fix crash in symtab.c.

2 files changed, 19 insertions, 11 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8f694501ce4..5d84bf7f5d6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-08  Bob Rossi  <bob@brasko.net>
+
+	* symtab.c (lookup_symtab): check return value of symtab_to_fullname
+
 2004-07-06  Jeff Johnston <jjohnstn@redhat.com>
 
 	* language.h (struct_language_defn): Add new function pointer:
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 8fa7cecb7a5..cd6dd5dd838 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -181,21 +181,25 @@ got_symtab:
     
     if (full_path != NULL)
       {
-	const char *fp = symtab_to_fullname (s);
-	if (FILENAME_CMP (full_path, fp) == 0)
-	  {
-	    return s;
-	  }
+        const char *fp = symtab_to_fullname (s);
+        if (fp != NULL && FILENAME_CMP (full_path, fp) == 0)
+          {
+            return s;
+          }
       }
 
     if (real_path != NULL)
       {
-	char *rp = gdb_realpath (symtab_to_fullname (s));
-        make_cleanup (xfree, rp);
-	if (FILENAME_CMP (real_path, rp) == 0)
-	  {
-	    return s;
-	  }
+        char *fullname = symtab_to_fullname (s);
+        if (fullname != NULL)
+          {
+            char *rp = gdb_realpath (fullname);
+            make_cleanup (xfree, rp);
+            if (FILENAME_CMP (real_path, rp) == 0)
+              {
+                return s;
+              }
+          }
       }
   }