Merge branch 'mr/bisect-use-after-free'

Use-after-free fix. * mr/bisect-use-after-free: bisect--helper: avoid use-after-free
git · Dec 25, 2019 · 4bfc9cc · 4bfc9cc
2 parents ba6b662 + 51a0a4e
commit 4bfc9cc
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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);
 	}