diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-25 20:21:59 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-25 20:21:59 +0100 |
| commit | 4bfc9ccfb6917805a4e1605bad359270172d145b (patch) | |
| tree | f7c534eac052dcde030612699926707b75d74a1c /builtin/bisect--helper.c | |
| parent | Merge branch 'ln/userdiff-elixir' (diff) | |
| parent | bisect--helper: avoid use-after-free (diff) | |
| download | git-4bfc9ccfb6917805a4e1605bad359270172d145b.tar.xz git-4bfc9ccfb6917805a4e1605bad359270172d145b.zip | |
Merge branch 'mr/bisect-use-after-free'
Use-after-free fix.
* mr/bisect-use-after-free:
bisect--helper: avoid use-after-free
Diffstat (limited to 'builtin/bisect--helper.c')
| -rw-r--r-- | builtin/bisect--helper.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 1fbe156e67..3055b2bb50 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -169,11 +169,12 @@ static int bisect_reset(const char *commit) argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL); if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { + error(_("could not check out original" + " HEAD '%s'. Try 'git bisect" + " reset <commit>'."), branch.buf); strbuf_release(&branch); argv_array_clear(&argv); - return error(_("could not check out original" - " HEAD '%s'. Try 'git bisect" - " reset <commit>'."), branch.buf); + return -1; } argv_array_clear(&argv); } |