From b69ca137aca2e4aa72f3cad60e0389019ab14116 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Mon, 25 May 2020 11:38:53 -0400 Subject: [PATCH] gdbserver: Don't add extra NULL to program args The vector holding the program args is passed as a parameter to target_create_inferior, which then passes it to stringify_argv for all platforms, where any NULL entry in the vector is ignored, so there seems to be no reason to actually add one after all. (Since the intention is to replace uses of stringify_argv with construct_inferior_arguments in a follow-up commit and that function doesn't currently handle such NULL arguments, it would otherwise have to be extended.) gdbserver/ChangeLog: * server.cc (captured_main), (handle_v_run): No longer insert extra NULL element to args vector. Change-Id: Ia2ef6d36814a6b11ce8b0d6e3b33248a7945e825 --- gdbserver/ChangeLog | 5 +++++ gdbserver/server.cc | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 0bf2bb97635..b4e6fa66608 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2020-05-25 Michael Weghorn + + * server.cc (captured_main), (handle_v_run): No longer + insert extra NULL element to args vector. + 2020-05-23 Pedro Alves * gdb-safe-ctype.h: New. diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 0672f9bc4d1..27d0931f793 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -3015,7 +3015,6 @@ handle_v_run (char *own_buf) if (*next_p) next_p++; } - new_argv.push_back (NULL); if (new_program_name == NULL) { @@ -3815,7 +3814,6 @@ captured_main (int argc, char *argv[]) program_path.set (make_unique_xstrdup (next_arg[0])); for (i = 1; i < n; i++) program_args.push_back (xstrdup (next_arg[i])); - program_args.push_back (NULL); /* Wait till we are at first instruction in program. */ target_create_inferior (program_path.get (), program_args); -- 2.30.2