From 176f26e96ab9958c84c98c88f31729d0240c420e Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 5 Apr 2018 12:45:51 -0400 Subject: [PATCH] dmx: Clean up some argument parsing code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This threw: ../hw/dmx/input/dmxarg.c: In function ‘dmxArgParse’: ../hw/dmx/input/dmxarg.c:128:5: warning: ‘strncpy’ specified bound depends on the length of the source argument [-Wstringop-overflow=] strncpy(tmp, string, len); ^~~~~~~~~~~~~~~~~~~~~~~~~ ../hw/dmx/input/dmxarg.c:126:11: note: length computed here len = strlen(string) + 2; ^~~~~~~~~~~~~~ This code predates xstrtokenize, but that's no excuse. Signed-off-by: Adam Jackson Acked-by: Keith Packard --- hw/dmx/input/dmxarg.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/hw/dmx/input/dmxarg.c b/hw/dmx/input/dmxarg.c index 6c21ae959..582ed3faa 100644 --- a/hw/dmx/input/dmxarg.c +++ b/hw/dmx/input/dmxarg.c @@ -114,30 +114,17 @@ dmxArgC(dmxArg a) dmxArg dmxArgParse(const char *string) { - char *tmp; - char *start, *pt; + int i = 0; dmxArg a = dmxArgCreate(); - int done; - int len; if (!string) return a; - len = strlen(string) + 2; - tmp = malloc(len); - strncpy(tmp, string, len); + a->argv = (const char **)xstrtokenize(string, ","); + if (a->argv) + for (i = 0; a->argv[i] != NULL; i++); + a->argc = i; - for (start = pt = tmp, done = 0; !done && *pt; start = ++pt) { - for (; *pt && *pt != ','; pt++); - if (!*pt) - done = 1; - *pt = '\0'; - dmxArgAdd(a, start); - } - if (!done) - dmxArgAdd(a, ""); /* Final comma */ - - free(tmp); return a; }