From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.66]) by sourceware.org (Postfix) with ESMTPS id 28CA53939C10 for ; Tue, 12 May 2020 15:42:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 28CA53939C10 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 07BDF2400FE for ; Tue, 12 May 2020 17:42:28 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 49M29v45nzz6tmQ; Tue, 12 May 2020 17:42:27 +0200 (CEST) From: Michael Weghorn To: gdb-patches@sourceware.org Cc: Michael Weghorn Subject: [PATCH v3 5/6] [PR gdbserver/25893]: Use construct_inferior_arguments which handles special chars Date: Tue, 12 May 2020 17:42:10 +0200 Message-Id: <20200512154211.1311364-5-m.weghorn@posteo.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200512154211.1311364-1-m.weghorn@posteo.de> References: <20200429111638.1327262-1-m.weghorn@posteo.de> <20200512154211.1311364-1-m.weghorn@posteo.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 May 2020 15:42:30 -0000 Use the construct_inferior_arguments function instead of stringify_argv to construct a string from the program arguments in those places where that one is then passed to fork_inferior (linux-low, lyn-low), since construct_inferior_arguments properly takes care of special characters, while stringify_argv does not. Using construct_inferior_arguments seems "natural", since its documentation also mentions that it "does the same shell processing as fork_inferior". Since construct_inferior_args has been extended to do proper quoting for Windows shells in commit 5d60742e2dd3c9b475dce54b56043a358751bbb8 ("Fix quoting of special characters for the MinGW build.", 2012-06-12), use it for the Windows case as well. (I could not test that case myself, though.) Adapt handling of empty args in function 'handle_v_run' in gdbserver/server.cc to just insert an empty string for an empty arg, since that one is now properly handled in 'construct_inferior_arguments' already (and inserting a "''" string in 'handle_v_run' would otherwise cause that one to be treated as a string literally containing two quote characters, which 'construct_inferior_args' would preserve by adding extra escaping). This makes gdbserver properly handle program args containing special characters (like spaces), e.g. (example from PR25893) $ gdbserver localhost:50505 myprogram "hello world" now properly handles "hello world" as a single arg, not two separate ones ("hello", "world"). 2020-05-12 Michael Weghorn PR gdbserver/25893 * linux-low.cc (linux_process_target::create_inferior), lynx-low.cc (lynx_process_target::create_inferior), win32-low.cc (win32_process_target::create_inferior): Use construct_inferior_arguments instead of stringify_argv to get string representation which properly escapes special characters. * server.cc (handle_v_run): Just pass empty program arg as such, since any further processing is now handled via construct_inferior_arguments --- gdbserver/linux-low.cc | 3 ++- gdbserver/lynx-low.cc | 3 ++- gdbserver/server.cc | 2 +- gdbserver/win32-low.cc | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 3cd8d5594d..5479f02f42 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -984,7 +984,8 @@ linux_process_target::create_inferior (const char *program, { maybe_disable_address_space_randomization restore_personality (cs.disable_randomization); - std::string str_program_args = stringify_argv (program_args); + std::string str_program_args + = construct_inferior_arguments (program_args.size (), program_args.data ()); pid = fork_inferior (program, str_program_args.c_str (), diff --git a/gdbserver/lynx-low.cc b/gdbserver/lynx-low.cc index 9aa140c129..361ee5b48f 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -253,7 +253,8 @@ lynx_process_target::create_inferior (const char *program, const std::vector &program_args) { int pid; - std::string str_program_args = stringify_argv (program_args); + std::string str_program_args + = construct_inferior_arguments (program_args.size (), program_args.data ()); lynx_debug ("create_inferior ()"); diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 27d0931f79..0313d18bb2 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -2957,7 +2957,7 @@ handle_v_run (char *own_buf) else if (p == next_p) { /* Empty argument. */ - new_argv.push_back (xstrdup ("''")); + new_argv.push_back (xstrdup ("")); } else { diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 4eb63b7ca2..7a012ca81d 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -693,7 +693,8 @@ win32_process_target::create_inferior (const char *program, DWORD flags; PROCESS_INFORMATION pi; DWORD err; - std::string str_program_args = stringify_argv (program_args); + std::string str_program_args + = construct_inferior_arguments (program_args.size (), program_args.data ()); char *args = (char *) str_program_args.c_str (); /* win32_wait needs to know we're not attaching. */ -- 2.26.2