From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH 2/2] stash show: fix segfault with --{include,only}-untracked
Date: Thu, 13 May 2021 08:48:55 +0900 [thread overview]
Message-ID: <xmqq35urecns.fsf@gitster.g> (raw)
In-Reply-To: <24de72b34de45980196ed6df8b64782887e94f36.1620850247.git.liu.denton@gmail.com> (Denton Liu's message of "Wed, 12 May 2021 13:16:13 -0700")
Denton Liu <liu.denton@gmail.com> writes:
> When `git stash show --include-untracked` or
> `git stash show --only-untracked` is run on a stash that doesn't include
> an untracked entry, a segfault occurs. This happens because we do not
> check whether the untracked entry is actually present and just attempt
> to blindly dereference it.
>
> Ensure that the untracked entry is present before actually attempting to
> dereference it.
Makes sense. Thanks.
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> builtin/stash.c | 8 ++++++--
> t/t3905-stash-include-untracked.sh | 15 +++++++++++++++
> 2 files changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/stash.c b/builtin/stash.c
> index 8922a1240c..82e4829d44 100644
> --- a/builtin/stash.c
> +++ b/builtin/stash.c
> @@ -900,10 +900,14 @@ static int show_stash(int argc, const char **argv, const char *prefix)
> diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt);
> break;
> case UNTRACKED_ONLY:
> - diff_root_tree_oid(&info.u_tree, "", &rev.diffopt);
> + if (info.has_u)
> + diff_root_tree_oid(&info.u_tree, "", &rev.diffopt);
> break;
> case UNTRACKED_INCLUDE:
> - diff_include_untracked(&info, &rev.diffopt);
> + if (info.has_u)
> + diff_include_untracked(&info, &rev.diffopt);
> + else
> + diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt);
> break;
> }
> log_tree_diff_flush(&rev);
> diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
> index 2e6796725b..1c9765928d 100755
> --- a/t/t3905-stash-include-untracked.sh
> +++ b/t/t3905-stash-include-untracked.sh
> @@ -405,4 +405,19 @@ test_expect_success 'stash show --include-untracked errors on duplicate files' '
> test_i18ngrep "worktree and untracked commit have duplicate entries: tracked" err
> '
>
> +test_expect_success 'stash show --{include,only}-untracked on stashes without untracked entries' '
> + git reset --hard &&
> + git clean -xf &&
> + >tracked &&
> + git add tracked &&
> + git stash &&
> +
> + git stash show >expect &&
> + git stash show --include-untracked >actual &&
> + test_cmp expect actual &&
> +
> + git stash show --only-untracked >actual &&
> + test_must_be_empty actual
> +'
> +
> test_done
prev parent reply other threads:[~2021-05-12 23:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 20:16 [PATCH 0/2] Fixes for dl/stash-show-untracked Denton Liu
2021-05-12 20:16 ` [PATCH 1/2] t3905: correct test title Denton Liu
2021-05-12 20:16 ` [PATCH 2/2] stash show: fix segfault with --{include,only}-untracked Denton Liu
2021-05-12 23:48 ` Junio C Hamano [this message]
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=xmqq35urecns.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=sunshine@sunshineco.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).