git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Miriam R." <mirucam@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git <git@vger.kernel.org>,
	Tanushree Tumane <tanushreetumane@gmail.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use
Date: Wed, 11 Dec 2019 20:14:03 +0100	[thread overview]
Message-ID: <CAN7CjDAYo=AZkVg4X_8iLLWTo43h=BBoOY+Ez-ODL0L_eb8xcg@mail.gmail.com> (raw)
In-Reply-To: <xmqqh826pyh4.fsf@gitster-ct.c.googlers.com>

El mié., 11 dic. 2019 a las 18:24, Junio C Hamano
(<gitster@pobox.com>) escribió:
>
> Junio C Hamano <gitster@pobox.com> writes:
>
> > Subject: Re: [Outreachy] [PATCH v2] bisect--helper: avoid free-after-use
>
> It is surprising with multiple mentors, nobody noticed free-after-use
> is perfectly fine---it is use-after-free we would want to avoid.
>

Yes, you are right. I will send another version with the correct title.

Thank you,
Miriam

> > Miriam Rubio <mirucam@gmail.com> writes:
> >
> >> From: Tanushree Tumane <tanushreetumane@gmail.com>
> >>
> >> 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>
> >> ---
> >> This patch is a new version of
> >> https://public-inbox.org/git/20191208172813.16518-1-mirucam@gmail.com/
> >> 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(-)
> >>
> >> 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);
> >>                      strbuf_release(&branch);
> >>                      argv_array_clear(&argv);
> >> -                    return error(_("could not check out original"
> >> -                                   " HEAD '%s'. Try 'git bisect"
> >> -                                   " reset <commit>'."), branch.buf);
> >
> > The original obviously was bad X-<.  Will queue.  Thanks.
> >
> >> +                    return -1;
> >>              }
> >>              argv_array_clear(&argv);
> >>      }

  reply	other threads:[~2019-12-11 19:14 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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. [this message]
2019-12-12 19:16     ` Johannes Schindelin
  -- strict thread matches above, loose matches on Subject: below --
2019-12-09 10:56 Miriam Rubio

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to='CAN7CjDAYo=AZkVg4X_8iLLWTo43h=BBoOY+Ez-ODL0L_eb8xcg@mail.gmail.com' \
    --to=mirucam@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=tanushreetumane@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* 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

	https://80x24.org/mirrors/git.git

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).