diff options
| author | René Scharfe <l.s.r@web.de> | 2022-10-07 17:08:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-07 19:21:18 +0200 |
| commit | 246526d019e0edf2ad804a182cae865ff5717cf7 (patch) | |
| tree | 39665bdb77be9dd7f275d6d02b981b7410f48de7 /builtin/bisect--helper.c | |
| parent | Merge a handful of topics from the 'master' front (diff) | |
| download | git-246526d019e0edf2ad804a182cae865ff5717cf7.tar.xz git-246526d019e0edf2ad804a182cae865ff5717cf7.zip | |
bisect--helper: plug strvec leak
The strvec "argv" is used to build a command for run_command_v_opt(),
but never freed. Use a constant string array instead, which doesn't
require any cleanup.
Suggested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | builtin/bisect--helper.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 8a052c7111..e90ce49695 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -764,11 +764,10 @@ static enum bisect_error bisect_start(struct bisect_terms *terms, const char **a strbuf_read_file(&start_head, git_path_bisect_start(), 0); strbuf_trim(&start_head); if (!no_checkout) { - struct strvec argv = STRVEC_INIT; + const char *argv[] = { "checkout", start_head.buf, + "--", NULL }; - strvec_pushl(&argv, "checkout", start_head.buf, - "--", NULL); - if (run_command_v_opt(argv.v, RUN_GIT_CMD)) { + if (run_command_v_opt(argv, RUN_GIT_CMD)) { res = error(_("checking out '%s' failed." " Try 'git bisect start " "<valid-branch>'."), |