Skip to contentSkip to conversation

bisect--helper: avoid use-after-free

PATCH New Miriam Rubio 1 participant 1 message Dec 11, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 bisect--helper: avoid use-after-free

From: Tanushree Tumane <[email protected]>

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.

---
This patch is a new version of
https://public-inbox.org/git/[email protected]/
which itself has been sent previously by Tanushree
(https://public-inbox.org/git/64117cde718f0d56ebfa4c30f4d8fe2155f5cf65.1551003074.git.gitgitgadget@gmail.com/).

 builtin/bisect--helper.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
builtin/bisect--helper.c +4 -3
index 1fbe156e67..3055b2bb50 100644
@@ -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);
 	}
Signature · 1 line
2.21.0 (Apple Git-122.2)