aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Khouzam <marc.khouzam@ericsson.com>2010-11-25 23:17:30 +0000
committerMarc Khouzam <marc.khouzam@ericsson.com>2010-11-25 23:17:30 +0000
commitf5a8e22b7eff2102d6a187dc331b13a8ea55af17 (patch)
treebbdb9087e89b4208818ca2614ec5b59226ed1911
parentaad5de7791540872ac305a56ceace35dd1e3116a (diff)
downloadgdb-f5a8e22b7eff2102d6a187dc331b13a8ea55af17.zip
gdb-f5a8e22b7eff2102d6a187dc331b13a8ea55af17.tar.gz
gdb-f5a8e22b7eff2102d6a187dc331b13a8ea55af17.tar.bz2
2010-11-25 Marc Khouzam <marc.khouzam@ericsson.com>
PR breakpoints/12217 * breakpoint.c (is_marker_spec): Check for NULL.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/breakpoint.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aa79939..173af54 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-25 Marc Khouzam <marc.khouzam@ericsson.com>
+
+ PR breakpoints/12217
+
+ * breakpoint.c (is_marker_spec): Check for NULL.
+
2010-11-25 Pedro Alves <pedro@codesourcery.com>
* breakpoint.h: No longer include python.h or python-internal.h.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 6b55313..2f4e10e 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -222,7 +222,7 @@ static void trace_pass_command (char *, int);
/* Assuming we're creating a static tracepoint, does S look like a
static tracepoint marker spec ("-m MARKER_ID")? */
#define is_marker_spec(s) \
- (strncmp (s, "-m", 2) == 0 && ((s)[2] == ' ' || (s)[2] == '\t'))
+ (s != NULL && strncmp (s, "-m", 2) == 0 && ((s)[2] == ' ' || (s)[2] == '\t'))
/* A reference-counted struct command_line. This lets multiple
breakpoints share a single command list. */