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 2C6973959CB4 for ; Wed, 29 Apr 2020 11:16:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2C6973959CB4 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A470C2400FC for ; Wed, 29 Apr 2020 13:16:56 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 49BwvW6hn2z6tmF; Wed, 29 Apr 2020 13:16:55 +0200 (CEST) From: Michael Weghorn To: gdb-patches@sourceware.org Subject: [PATCH 3/4] [PR gdbserver/25893]: Use construct_inferior_arguments which handles special chars Date: Wed, 29 Apr 2020 13:16:37 +0200 Message-Id: <20200429111638.1327262-5-m.weghorn@posteo.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200429111638.1327262-1-m.weghorn@posteo.de> References: <20200429111638.1327262-1-m.weghorn@posteo.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-19.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, 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: Wed, 29 Apr 2020 11:17:02 -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, 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". This makes gdbserver properly handle program args containing special characters, 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"). I'm not sure regarding the two remaining uses of function stringify_argv (in win32_process_target::create_inferior and nto_process_target::create_inferior) whose result is not passed to fork_inferior and don't know how the arg processing in the creation of processes on those targets exactly works, so left them unchanged for now. 2020-04-29 Michael Weghorn PR gdbserver/25893 * linux-low.cc (linux_process_target::create_inferior), lynx-low.cc (lynx_process_target::create_inferior): Use construct_inferior_arguments instead of stringify_argv to get string representation which properly escapes special characters. --- gdbserver/linux-low.cc | 2 +- gdbserver/lynx-low.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 3cd8d5594d..3f3ffc6c43 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -984,7 +984,7 @@ 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..61f692f0c0 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -253,7 +253,7 @@ 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 ()"); -- 2.26.2