mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Miriam Rubio <>
Cc: Tanushree Tumane <>,
	Johannes Schindelin <>,
	Christian Couder <>,
	Miriam Rubio <>
Subject: [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use
Date: Mon,  9 Dec 2019 11:56:47 +0100	[thread overview]
Message-ID: <> (raw)

From: Tanushree Tumane <>

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

However, this error message used the `strbuf` that had just been
released already. Let's switch that around: first use it, then release

Mentored-by: Johannes Schindelin <>
Mentored-by: Christian Couder <>
Signed-off-by: Tanushree Tumane <>
Signed-off-by: Miriam Rubio <>
This patch is a new version of
which itself has been sent previously by Tanushree

 builtin/bisect--helper.c | 7 ++++---
 1 file 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);
-			return error(_("could not check out original"
-				       " HEAD '%s'. Try 'git bisect"
-				       " reset <commit>'."), branch.buf);
+			return -1;
2.21.0 (Apple Git-122.2)

             reply	other threads:[~2019-12-09 10:59 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-09 10:56 Miriam Rubio [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-12-09 10:39 [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use Miriam Rubio
2019-12-11 17:17 ` Junio C Hamano
2019-12-11 17:24   ` Junio C Hamano
2019-12-11 19:14     ` Miriam R.
2019-12-12 19:16     ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).