From 26c957f12762816a90d5145c7c527ca48c890855 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 21 Aug 2019 21:11:33 +0100 Subject: [PATCH] Fix nullptr in with_command_1 Running 'with' without arguments crashes GDB. This fixes it. gdb/ChangeLog: 2019-08-21 Bogdan Harjoc * cli/cli-cmds.c (with_command_1): Error out if no arguments. gdb/testsuite/ChangeLog: 2019-08-21 Pedro Alves * gdb.base/with.exp: Test "with" with no arguments. --- gdb/ChangeLog | 4 ++++ gdb/cli/cli-cmds.c | 3 +++ gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/with.exp | 2 ++ 4 files changed, 13 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 01e60fb1894..966bfb7d9fc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2019-08-21 Bogdan Harjoc + + * cli/cli-cmds.c (with_command_1): Error out if no arguments. + 2019-08-21 Christian Biesinger * tui/tui-data.h (tui_gen_win_info): Add an =default diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 30e0958b60b..4fc656775c9 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -217,6 +217,9 @@ void with_command_1 (const char *set_cmd_prefix, cmd_list_element *setlist, const char *args, int from_tty) { + if (args == nullptr) + error (_("Missing arguments.")); + const char *delim = strstr (args, "--"); const char *nested_cmd = nullptr; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7fea9cd0712..e56cc16628d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-08-21 Pedro Alves + + * gdb.base/with.exp: Test "with" with no arguments. + 2019-08-21 Tom de Vries * gdb.base/gdb-caching-proc.exp: Sort files. diff --git a/gdb/testsuite/gdb.base/with.exp b/gdb/testsuite/gdb.base/with.exp index 9ea768563a3..a972296d78f 100644 --- a/gdb/testsuite/gdb.base/with.exp +++ b/gdb/testsuite/gdb.base/with.exp @@ -220,6 +220,8 @@ with_test_prefix "run control" { # Check errors. with_test_prefix "errors" { + gdb_test "with" "Missing arguments\\." + # Try both an unknown root setting and an unknown prefixed # setting. The errors come from different locations in the # sources. -- 2.39.2