diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-12-25 22:25:30 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-12-25 22:25:30 +0000 |
| commit | e225be1c504a9fbd84561e52bc565f121766a5d0 (patch) | |
| tree | d6b39a7d4bf47f234fa79cabc574fe302d50a15b | |
| parent | test: config: ‘bell’ section (diff) | |
tokenize: free content of argv on failure, and reset the argv pointer
This fixes a memory leak when we failed to parse a command line (for
example, because it contained an unclosed quote).
| -rw-r--r-- | tokenize.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -49,9 +49,7 @@ tokenize_cmdline(const char *cmdline, char ***argv) if (end == NULL) { if (delim != ' ') { LOG_ERR("unterminated %s quote", delim == '"' ? "double" : "single"); - free(*argv); - *argv = NULL; - return false; + goto err; } if (!push_argv(argv, &argv_size, p, final_end - p, &idx) || @@ -97,6 +95,9 @@ tokenize_cmdline(const char *cmdline, char ***argv) return true; err: + for (size_t i = 0; i < idx; i++) + free((*argv)[i]); free(*argv); + *argv = NULL; return false; } |
