2003-07-23 Michal Ludvig <mludvig@suse.cz>

	    Elena Zannoni  <ezannoni@redhat.com>

 	* linespec.c (decode_line_2): Avoid crash if
 	find_function_start_sal() returns empty record.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4271182d0b005a4bb8f85e5c6b4fa876152ef140..85414a862065489ac59d4c2695dadc0486879a39 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-23  Michal Ludvig  <mludvig@suse.cz>
+           Elena Zannoni  <ezannoni@redhat.com>
+
+       * linespec.c (decode_line_2): Avoid crash if 
+       find_function_start_sal() returns empty record.
+
 2003-07-23  Andreas Schwab  <schwab@suse.de>
 
        * ia64-tdep.c (ia64_print_insn): New function.

diff --git a/gdb/linespec.c b/gdb/linespec.c
index b8f727453ea04a30b46a7ab394e6c69f840ad5c5..4b863ef8f745dcd656d43b1892eec25cc9a22937 100644 (file)
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -483,11 +483,18 @@ decode_line_2 (struct symbol *sym_arr[], int nelts, int funfirstline,
       if (sym_arr[i] && SYMBOL_CLASS (sym_arr[i]) == LOC_BLOCK)
        {
          values.sals[i] = find_function_start_sal (sym_arr[i], funfirstline);
-         printf_unfiltered ("[%d] %s at %s:%d\n",
-                            (i + 2),
-                            SYMBOL_PRINT_NAME (sym_arr[i]),
-                            values.sals[i].symtab->filename,
-                            values.sals[i].line);
+         if (values.sals[i].symtab)
+           printf_unfiltered ("[%d] %s at %s:%d\n",
+                              (i + 2),
+                              SYMBOL_PRINT_NAME (sym_arr[i]),
+                              values.sals[i].symtab->filename,
+                              values.sals[i].line);
+         else
+           printf_unfiltered ("[%d] %s at ?FILE:%d [No symtab? Probably broken debug info...]\n",
+                              (i + 2),
+                              SYMBOL_PRINT_NAME (sym_arr[i]),
+                              values.sals[i].line);
+
        }
       else
        printf_unfiltered ("?HERE\n");