From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: Thomas De Zeeuw <thomas@slight.dev>
Cc: git@vger.kernel.org
Subject: Re: Bug: Segmentation fault in git diff
Date: Wed, 18 Aug 2021 19:52:33 +0700 [thread overview]
Message-ID: <YR0CkdVNVKa65vbo@danh.dev> (raw)
In-Reply-To: <YRzkq47gOGfn8zsw@danh.dev>
On 2021-08-18 17:44:59+0700, Đoàn Trần Công Danh <congdanhqx@gmail.com> wrote:
> On 2021-08-18 10:42:45+0200, Thomas De Zeeuw <thomas@slight.dev> wrote:
> > Hello,
> >
> > This is my first bug report to Git mailing list so let me know if more information is needed.
> >
> > Running the following command results in a segmentation fault on macOS arm64
> > $ git diff --name-only --diff-filter=U —relative
> > Segmentation fault: 11
>
> MVCE:
>
> ---- 8< ---
> #!/bin/sh
>
> rm -rf /tmp/diff-bug
> git init /tmp/diff-bug
> cd /tmp/diff-bug
> mkdir -p dir
>
> printf '%s\n' one two three >file
> printf '%s\n' inner >dir/file
> git add file dir/file
> git commit -m first
>
> git branch side
>
> printf '%s\n' one two >file
> git add file
> git commit -m checkpoint
> git tag checkpoint
>
> git switch side
> printf '%s\n' two two four >file
> git add file
> git commit -m side
>
> cd dir
> git rebase checkpoint
>
> git diff --name-only --relative
> ---- >8 -----
>
> It's NULL pointer dereference bug because pair is NULL.
> I haven't check further:
>
> ---- 8< -----
> #0 run_diff_files (revs=revs@entry=0x7ffcc85ae270, option=option@entry=0)
> at diff-lib.c:196
> 196 pair->two->mode = wt_mode;
> ----- >8 -----
This diff could fix the issue, and the test suite still passes:
---- 8< ----
diff --git a/diff-lib.c b/diff-lib.c
index f9eadc4fc1..8f303958dd 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -192,7 +192,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
* from the desired stage.
*/
pair = diff_unmerge(&revs->diffopt, ce->name);
- if (wt_mode)
+ if (pair && wt_mode)
pair->two->mode = wt_mode;
if (ce_stage(ce) != diff_unmerged_stage)
continue;
---- >8 -----
--
Danh
next prev parent reply other threads:[~2021-08-18 12:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-21 4:03 [PATCH v2] diff-lib: ignore all outsider if --relative asked Đoàn Trần Công Danh
2021-08-18 8:42 ` Bug: Segmentation fault in git diff Thomas De Zeeuw
2021-08-18 10:44 ` Đoàn Trần Công Danh
2021-08-18 12:52 ` Đoàn Trần Công Danh [this message]
2021-08-18 20:30 ` Junio C Hamano
2021-08-19 8:29 ` [PATCH] diff-lib: ignore all outsider if --relative asked Đoàn Trần Công Danh
2021-08-19 9:02 ` Carlo Arenas
2021-08-19 16:58 ` Junio C Hamano
2021-08-19 16:55 ` Junio C Hamano
2021-08-22 8:49 ` [PATCH v3] " Đoàn Trần Công Danh
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=YR0CkdVNVKa65vbo@danh.dev \
--to=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=thomas@slight.dev \
/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).