2010-11-25 Marc Khouzam <marc.khouzam@ericsson.com>

	PR breakpoints/12217

	* breakpoint.c (is_marker_spec): Check for NULL.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aa79939777e90b8cf964a6affaf5e05e333f51ef..173af54f42a1f4e16210b70237a25c7f26cfb705 100644 (file)
--- 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 6b553137346d4caf2e907b28d79cd444ab5cabc7..2f4e10ec1426160d2e773f44482c5be02c0503dc 100644 (file)
--- 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.  */