diff options
| author |  Tanushree Tumane <tanushreetumane@gmail.com> | 2019-12-09 11:56:47 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-12-11 09:24:27 -0800 |
| commit | 51a0a4ed9597e949930d92be59f42f991bc40a7c (patch) | |
| tree | 5f74d207d7f6b8bf0e792a082a4f683f344b2e91 | |
| parent | Git 2.21.1 (diff) | |
| download | tgif-51a0a4ed9597e949930d92be59f42f991bc40a7c.tar.xz | |
bisect--helper: avoid use-after-free
In 5e82c3dd22a (bisect--helper: `bisect_reset` shell function in C,
2019-01-02), the `git bisect reset` subcommand was ported to C. When the
call to `git checkout` failed, an error message was reported to the
user.
However, this error message used the `strbuf` that had just been
released already. Let's switch that around: first use it, then release
it.
Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
Signed-off-by: Miriam Rubio <mirucam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 e7325fe37f..c7b8223151 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); } |