git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Gregory David <gregory.david@p1sec.com>
Cc: git@vger.kernel.org
Subject: Re: bugreport - SEGFAULT on 'git show-branch --current --reflog=3'
Date: Wed, 13 Apr 2022 20:46:01 +0200	[thread overview]
Message-ID: <220413.86wnfses7c.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <6d510d78-9b0b-c463-889b-cd3855ccdd1b@p1sec.com>


On Wed, Apr 13 2022, Gregory David wrote:

> [[PGP Signed Part:Undecided]]
> Thanks a lot Aevar!
>
> Don't you mean this:
>
> diff --git a/builtin/show-branch.c b/builtin/show-branch.c
> index 330b0553b9..2a5c31729d 100644
> --- a/builtin/show-branch.c
> +++ b/builtin/show-branch.c
> @@ -881,7 +881,7 @@ int cmd_show_branch(int ac, const char **av, const
> char *prefix)
>                                        get_color_reset_code(), ref_name[i]);
>                         }
>
> -                       if (!reflog) {
> +                       if (!reflog || !rev[i]) {
>                                 /* header lines never need name */
>                                 show_one_commit(rev[i], 1);

No, but my "suggested" fix was just enough to compile and get past the
segfault, i.e. we don't reach the puts(reflog_msg[i]) branch, but of
course rev[i] may be NULL too, I didn't check.

For this one though: I haven't tried it, but reading show_one_commit()
one of the first things we do is dereference the 1st argument, so surely
that will segfault too...

  reply	other threads:[~2022-04-13 18:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-13  8:39 bugreport - SEGFAULT on 'git show-branch --current --reflog=3' Gregory David
2022-04-13 13:57 ` Ævar Arnfjörð Bjarmason
2022-04-13 15:48   ` Gregory David
2022-04-13 18:46     ` Ævar Arnfjörð Bjarmason [this message]
2022-04-14  7:20       ` Gregory David
2022-04-14  7:40       ` Gregory David

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

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

  git send-email \
    --in-reply-to=220413.86wnfses7c.gmgdl@evledraar.gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gregory.david@p1sec.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.
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 NNTP newsgroup(s).