Commit 5dc5ecd1 authored by Philippe Waroquiers's avatar Philippe Waroquiers
Browse files

Fix regression for multi breakpoints command line clearing.

breakpoint.c is modified to fix the regression introduced
when clearing the commands of several breakpoints by giving an empty
list of commands, by just typing "end".
GDB should read an empty list of command once, but it reads
it for each breakpoint, as an empty list of command is NULL,
and NULL is interpreted as 'not having read the command list yet'.

The fix consists in having a boolean set to true once the
command list has been read.


2018-08-26  Philippe Waroquiers  <>

	* breakpoint.c (commands_command_1): New boolean cmd_read
	to detect cmd was already read.
parent fec2cf34
......@@ -1221,6 +1221,10 @@ commands_command_1 (const char *arg, int from_tty,
struct command_line *control)
counted_command_line cmd;
/* cmd_read will be true once we have read cmd. Note that cmd might still be
NULL after the call to read_command_lines if the user provides an empty
list of command by just typing "end". */
bool cmd_read = false;
std::string new_arg;
......@@ -1237,8 +1241,9 @@ commands_command_1 (const char *arg, int from_tty,
(arg, [&] (breakpoint *b)
if (cmd == NULL)
if (!cmd_read)
gdb_assert (cmd == NULL);
if (control != NULL)
cmd = control->body_list_0;
......@@ -1258,6 +1263,7 @@ commands_command_1 (const char *arg, int from_tty,
cmd = read_command_lines (str.c_str (), from_tty, 1, validator);
cmd_read = true;
/* If a breakpoint was on the list more than once, we don't need to
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment