Skip to content

Commit 4bfc9cc

Browse files
committed
Merge branch 'mr/bisect-use-after-free'
Use-after-free fix. * mr/bisect-use-after-free: bisect--helper: avoid use-after-free
2 parents ba6b662 + 51a0a4e commit 4bfc9cc

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

builtin/bisect--helper.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,12 @@ static int bisect_reset(const char *commit)
169169

170170
argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL);
171171
if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
172+
error(_("could not check out original"
173+
" HEAD '%s'. Try 'git bisect"
174+
" reset <commit>'."), branch.buf);
172175
strbuf_release(&branch);
173176
argv_array_clear(&argv);
174-
return error(_("could not check out original"
175-
" HEAD '%s'. Try 'git bisect"
176-
" reset <commit>'."), branch.buf);
177+
return -1;
177178
}
178179
argv_array_clear(&argv);
179180
}

0 commit comments

Comments
 (0)