commit d903ec9aae187a608670f040d40a89ca1fed243a from: Omar Polo date: Sun May 29 08:38:17 2022 UTC drop a local variable don't need to keep `files' around, res->files is enough. it would have prevented the previous bug (probably.) commit - a185ed1ea0aa9e48c5cc2708ee45ef4c80bd4277 commit + d903ec9aae187a608670f040d40a89ca1fed243a blob - 977e533e0ffea9ddfb740d196d9ca8eaf122370d blob + a12e1cf15b7ee48352b18f7cc21fe0b4e9deda6b --- ctl.c +++ ctl.c @@ -249,7 +249,6 @@ ctlaction(struct parse_result *res) size_t datalen; ssize_t n; int i, type, ret = 0, done = 1; - char **files; switch (res->action) { case PLAY: @@ -284,10 +283,10 @@ ctlaction(struct parse_result *res) break; case ADD: done = 0; - for (i = 0, files = res->files; files[i] != NULL; ++i) { + for (i = 0; res->files[i] != NULL; ++i) { memset(&path, 0, sizeof(path)); - if (realpath(files[i], path) == NULL) { - log_warn("realpath %s", files[i]); + if (realpath(res->files[i], path) == NULL) { + log_warn("realpath %s", res->files[i]); continue; } @@ -379,17 +378,17 @@ ctlaction(struct parse_result *res) switch (res->action) { case ADD: - if (files[i] == NULL) + if (res->files[i] == NULL) fatalx("received more replies than " "files enqueued."); if (imsg.hdr.type == IMSG_CTL_ADD) - log_debug("enqueued %s", files[i]); + log_debug("enqueued %s", res->files[i]); else fatalx("invalid message %d", imsg.hdr.type); i++; - done = files[i] == NULL; + done = res->files[i] == NULL; break; case SHOW: if (datalen == 0) {