gdb: handle missing arguments to 'maint test-remote-args'
Checks
Commit Message
I noticed that the 'maint test-remote-args' command, implemented by
the test_remote_args_command function in remote.c, contains this code:
static void
test_remote_args_command (const char *args, int from_tty)
{
std::vector<std::string> split_args = gdb::remote_args::split (args);
... etc ...
The problem here is that gdb::remote_args::split expects a std::string,
and so ends up creating a std::string from ARGS. However, ARGS can be
NULL, e.g. if a user does this:
(gdb) maint test-remote-args
This ends up creating a std::string from a NULL pointer, which is
undefined behaviour.
Fix this by adding a check to test_remote_args_command, and throwing
an error if ARGS is NULL. Add a new test to verify this case.
Additionally, fix a typo in the header comment for
test_remote_args_command.
---
gdb/remote.c | 5 ++++-
gdb/testsuite/gdb.base/maint-test-remote-args.exp | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
base-commit: f577746edb4ca2678f69feb5e5848a646d5cd856
Comments
>>>>> "Andrew" == Andrew Burgess <aburgess@redhat.com> writes:
Andrew> Fix this by adding a check to test_remote_args_command, and throwing
Andrew> an error if ARGS is NULL. Add a new test to verify this case.
Makes sense to me, thanks.
Approved-By: Tom Tromey <tom@tromey.com>
Tom
Tom Tromey <tom@tromey.com> writes:
>>>>>> "Andrew" == Andrew Burgess <aburgess@redhat.com> writes:
>
> Andrew> Fix this by adding a check to test_remote_args_command, and throwing
> Andrew> an error if ARGS is NULL. Add a new test to verify this case.
>
> Makes sense to me, thanks.
> Approved-By: Tom Tromey <tom@tromey.com>
Pushed.
Thanks,
Andrew
@@ -12767,12 +12767,15 @@ cli_packet_command (const char *args, int from_tty)
The split and joined arguments are printed out. Additionally, the
joined arguments are split and joined a second time, and compared to the
result of the first join, this provides some basic validation that GDB
- sess the joined arguments as equivalent to the original argument
+ sees the joined arguments as equivalent to the original argument
string. */
static void
test_remote_args_command (const char *args, int from_tty)
{
+ if (args == nullptr)
+ error (_("missing argument string"));
+
std::vector<std::string> split_args = gdb::remote_args::split (args);
gdb_printf ("Input (%s)\n", args);
@@ -38,3 +38,6 @@ gdb_test "maint test-remote-args a b c" \
" \\(b\\)" \
" \\(c\\)" \
"Output \\(a b c\\)"]
+
+gdb_test "maint test-remote-args" "^missing argument string" \
+ "command without an argument string"