branch | stable |
changeset 37871 | 3c84493556db |
parent 35998 | 9724f54923ec |
child 44308 | 04a3ae7aba14 |
--- a/contrib/chg/chg.c Wed Jun 06 13:28:49 2018 -0400 +++ b/contrib/chg/chg.c Wed Jun 06 12:53:26 2018 -0700 @@ -220,7 +220,10 @@ const char **argv = mallocx(sizeof(char *) * argsize); memcpy(argv, baseargv, sizeof(baseargv)); - memcpy(argv + baseargvsize, opts->args, sizeof(char *) * opts->argsize); + if (opts->args) { + size_t size = sizeof(char *) * opts->argsize; + memcpy(argv + baseargvsize, opts->args, size); + } argv[argsize - 1] = NULL; if (putenv("CHGINTERNALMARK=") != 0)