aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog3
-rw-r--r--gdb/f-valprint.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4acf4e7..346f915 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
2007-07-31 Michael Snyder <msnyder@access-company.com>
+ * f-valprint.c (info_common_command): Bail out to prevent null
+ pointer deref. Break up a long line.
+
* exec.c (xfer_memory): Remove redundant condition from 'if'.
* symfile.c (reread_separate_symbols): Free xmalloced memory.
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 41a9771..2ba10b4 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -671,7 +671,8 @@ info_common_command (char *comname, int from_tty)
be any minimal symbols in the middle of a function.
FIXME: (Not necessarily true. What about text labels) */
- struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_pc (fi));
+ struct minimal_symbol *msymbol =
+ lookup_minimal_symbol_by_pc (get_frame_pc (fi));
if (msymbol != NULL
&& (SYMBOL_VALUE_ADDRESS (msymbol)
@@ -687,6 +688,8 @@ info_common_command (char *comname, int from_tty)
if (msymbol != NULL)
funname = DEPRECATED_SYMBOL_NAME (msymbol);
+ else /* Got no 'funname', code below will fail. */
+ error (_("No function found for frame."));
}
/* If comname is NULL, we assume the user wishes to see the