From 092debf060810250e12e6590af58414fd93ebee2 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Thu, 25 Nov 2010 23:25:33 +0000 Subject: [PATCH] 2010-11-25 Marc Khouzam PR breakpoints/12217 * breakpoint.c (is_marker_spec): Check for NULL. --- gdb/ChangeLog | 6 ++++++ gdb/breakpoint.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 05a4fca83be..d480538db4e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2010-11-25 Marc Khouzam + + PR breakpoints/12217 + + * breakpoint.c (is_marker_spec): Check for NULL. + 2010-11-25 Tom Tromey * dwarf2read.c (dwarf2_const_value_data): Never sign extend. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 6a6864cf333..484cc379111 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -233,7 +233,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. */ -- 2.47.2