diff options
author | Mike Frysinger <vapier@gentoo.org> | 2021-05-05 14:54:33 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2021-05-05 23:33:16 -0400 |
commit | 75070a4ede3760d4185c994200b40c9a35687eb4 (patch) | |
tree | c39fa3c90b5477908c863a51e7f3b5591e7420bb /sim/rx/gdb-if.c | |
parent | 4467df35a93e4c8e5ff7549e8d23324c64f527bd (diff) | |
download | fsf-binutils-gdb-75070a4ede3760d4185c994200b40c9a35687eb4.zip fsf-binutils-gdb-75070a4ede3760d4185c994200b40c9a35687eb4.tar.gz fsf-binutils-gdb-75070a4ede3760d4185c994200b40c9a35687eb4.tar.bz2 |
sim: m32c/rl78/rx: fix command parsing
Use buildargv to avoid writing to const memory and freeing invalid
pointers, and to avoid doing any string parsing ourselves.
Diffstat (limited to 'sim/rx/gdb-if.c')
-rw-r--r-- | sim/rx/gdb-if.c | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c index 3d052e6..ec41910 100644 --- a/sim/rx/gdb-if.c +++ b/sim/rx/gdb-if.c @@ -27,6 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <stdlib.h> #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 ** |