From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 6D471385802D for ; Wed, 5 May 2021 23:06:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6D471385802D Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 5B1DB33FE49 for ; Wed, 5 May 2021 23:06:46 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH v3] sim: m32c/rl78/rx: fix command parsing Date: Wed, 5 May 2021 19:06:44 -0400 Message-Id: <20210505230644.17909-1-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <877dkdq9hr.fsf@tromey.com> References: <877dkdq9hr.fsf@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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, 05 May 2021 23:06:49 -0000 Use buildargv to avoid writing to const memory and freeing invalid pointers, and to avoid doing any string parsing ourselves. --- sim/m32c/gdb-if.c | 39 ++++++++++++++------------------------- sim/rl78/gdb-if.c | 44 +++++++++++++++----------------------------- sim/rx/gdb-if.c | 41 +++++++++++++++-------------------------- 3 files changed, 44 insertions(+), 80 deletions(-) diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c index 92e447f17faa..c2aff064ff0f 100644 --- a/sim/m32c/gdb-if.c +++ b/sim/m32c/gdb-if.c @@ -27,6 +27,7 @@ along with this program. If not, see . */ #include #include "ansidecl.h" +#include "libiberty.h" #include "gdb/callback.h" #include "gdb/remote-sim.h" #include "gdb/signals.h" @@ -648,37 +649,25 @@ sim_stop_reason (SIM_DESC sd, enum sim_stop *reason_p, int *sigrc_p) void sim_do_command (SIM_DESC sd, const char *cmd) { - const char *args; - char *p = strdup (cmd); + const char *arg; + char **argv = buildargv (cmd); check_desc (sd); - /* Skip leading whitespace. */ - while (isspace (*p)) - p++; - - /* Find the extent of the command word. */ - for (p = cmd; *p; p++) - if (isspace (*p)) - break; - - /* Null-terminate the command word, and record the start of any - further arguments. */ - if (*p) + cmd = arg = ""; + if (argv != NULL) { - *p = '\0'; - args = p + 1; - while (isspace (*args)) - args++; + if (argv[0] != NULL) + cmd = argv[0]; + if (argv[1] != NULL) + arg = argv[1]; } - else - args = p; if (strcmp (cmd, "trace") == 0) { - if (strcmp (args, "on") == 0) + if (strcmp (arg, "on") == 0) trace = 1; - else if (strcmp (args, "off") == 0) + else if (strcmp (arg, "off") == 0) trace = 0; else printf ("The 'sim trace' command expects 'on' or 'off' " @@ -686,9 +675,9 @@ sim_do_command (SIM_DESC sd, const char *cmd) } else if (strcmp (cmd, "verbose") == 0) { - if (strcmp (args, "on") == 0) + if (strcmp (arg, "on") == 0) verbose = 1; - else if (strcmp (args, "off") == 0) + else if (strcmp (arg, "off") == 0) verbose = 0; else printf ("The 'sim verbose' command expects 'on' or 'off'" @@ -698,7 +687,7 @@ sim_do_command (SIM_DESC sd, const char *cmd) printf ("The 'sim' command expects either 'trace' or 'verbose'" " as a subcommand.\n"); - free (p); + freeargv (argv); } char ** diff --git a/sim/rl78/gdb-if.c b/sim/rl78/gdb-if.c index 7119214113be..f4b6754f5873 100644 --- a/sim/rl78/gdb-if.c +++ b/sim/rl78/gdb-if.c @@ -27,6 +27,7 @@ along with this program. If not, see . */ #include #include "ansidecl.h" +#include "libiberty.h" #include "gdb/callback.h" #include "gdb/remote-sim.h" #include "gdb/signals.h" @@ -533,40 +534,25 @@ sim_stop_reason (SIM_DESC sd, enum sim_stop *reason_p, int *sigrc_p) void sim_do_command (SIM_DESC sd, const char *cmd) { - const char *args; - char *p = strdup (cmd); + const char *arg; + char **argv = buildargv (cmd); check_desc (sd); - if (cmd == NULL) + cmd = arg = ""; + if (argv != NULL) { - cmd = ""; - args = ""; - } - else - { - /* Skip leading whitespace. */ - while (isspace (*p)) - p++; - - /* Null-terminate the command word, and record the start of any - further arguments. */ - if (*p) - { - *p = '\0'; - args = p + 1; - while (isspace (*args)) - args++; - } - else - args = p; + if (argv[0] != NULL) + cmd = argv[0]; + if (argv[1] != NULL) + arg = argv[1]; } if (strcmp (cmd, "trace") == 0) { - if (strcmp (args, "on") == 0) + if (strcmp (arg, "on") == 0) trace = 1; - else if (strcmp (args, "off") == 0) + else if (strcmp (arg, "off") == 0) trace = 0; else printf ("The 'sim trace' command expects 'on' or 'off' " @@ -574,11 +560,11 @@ sim_do_command (SIM_DESC sd, const char *cmd) } else if (strcmp (cmd, "verbose") == 0) { - if (strcmp (args, "on") == 0) + if (strcmp (arg, "on") == 0) verbose = 1; - else if (strcmp (args, "noisy") == 0) + else if (strcmp (arg, "noisy") == 0) verbose = 2; - else if (strcmp (args, "off") == 0) + else if (strcmp (arg, "off") == 0) verbose = 0; else printf ("The 'sim verbose' command expects 'on', 'noisy', or 'off'" @@ -588,7 +574,7 @@ sim_do_command (SIM_DESC sd, const char *cmd) printf ("The 'sim' command expects either 'trace' or 'verbose'" " as a subcommand.\n"); - free (p); + freeargv (argv); } /* Stub for command completion. */ diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c index 3d052e62baa2..ec4191095888 100644 --- a/sim/rx/gdb-if.c +++ b/sim/rx/gdb-if.c @@ -27,6 +27,7 @@ along with this program. If not, see . */ #include #include "ansidecl.h" +#include "libiberty.h" #include "gdb/callback.h" #include "gdb/remote-sim.h" #include "gdb/signals.h" @@ -794,37 +795,25 @@ sim_stop_reason (SIM_DESC sd, enum sim_stop *reason_p, int *sigrc_p) void sim_do_command (SIM_DESC sd, const char *cmd) { - const char *args; - char *p = strdup (cmd); + const char *arg; + char **argv = buildargv (cmd); check_desc (sd); - /* Skip leading whitespace. */ - while (isspace (*p)) - p++; - - /* Find the extent of the command word. */ - for (; *p != '\0'; p++) - if (isspace (*p)) - break; - - /* Null-terminate the command word, and record the start of any - further arguments. */ - if (*p != '\0') + cmd = arg = ""; + if (argv != NULL) { - *p = '\0'; - args = p + 1; - while (isspace (*args)) - args++; + if (argv[0] != NULL) + cmd = argv[0]; + if (argv[1] != NULL) + arg = argv[1]; } - else - args = p; if (strcmp (cmd, "trace") == 0) { - if (strcmp (args, "on") == 0) + if (strcmp (arg, "on") == 0) trace = 1; - else if (strcmp (args, "off") == 0) + else if (strcmp (arg, "off") == 0) trace = 0; else printf ("The 'sim trace' command expects 'on' or 'off' " @@ -832,11 +821,11 @@ sim_do_command (SIM_DESC sd, const char *cmd) } else if (strcmp (cmd, "verbose") == 0) { - if (strcmp (args, "on") == 0) + if (strcmp (arg, "on") == 0) verbose = 1; - else if (strcmp (args, "noisy") == 0) + else if (strcmp (arg, "noisy") == 0) verbose = 2; - else if (strcmp (args, "off") == 0) + else if (strcmp (arg, "off") == 0) verbose = 0; else printf ("The 'sim verbose' command expects 'on', 'noisy', or 'off'" @@ -846,7 +835,7 @@ sim_do_command (SIM_DESC sd, const char *cmd) printf ("The 'sim' command expects either 'trace' or 'verbose'" " as a subcommand.\n"); - free (p); + freeargv (argv); } char ** -- 2.31.1