From: "René Scharfe" <l.s.r@web.de>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Cc: "Johannes Schindelin" <johannes.schindelin@gmx.de>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [BUG?] git range-diff -Ix @{1}... segfaults
Date: Sat, 4 Sep 2021 09:50:58 +0200 [thread overview]
Message-ID: <7ac58fa9-f0f3-53bc-e51b-de9cd4efdb29@web.de> (raw)
In-Reply-To: <xmqqbl59fq9i.fsf@gitster.g>
Am 03.09.21 um 20:49 schrieb Junio C Hamano:
> It does not seem to trigger with an empty range, e.g.
>
> $ git range-diff -Ix HEAD...
> $ git range-diff -Ix HEAD~...
> -: ---------- > 1: 0a0bc7d03a scalar: accept -C and -c opt...
>
> but when it needs real comparison, the -I seems to kill the command
> quite easily.
Reverting c45dc9cf30 (diff: plug memory leak from regcomp() on
{log,diff} -I, 2021-02-11) fixes the segfault.
diff.c::diff_free() frees the ignore_regex member of a struct
diff_options, but doesn't reset the ignore_regex_nr nor clears the
pointer. It is called from diff.c::diff_flush().
range-diff.c::output() calls diff.c::diff_flush() in a loop with the
same struct diff_options (via range-diff.c::patch_diff()).
So the second iteration of that loop tries to use the already freed
ignore regexes. Here's a patch for that:
--- >8 ---
Subject: [PATCH] range-diff: avoid segfault with -I
output() reuses the same struct diff_options for multiple calls of
diff_flush(). Set the option no_free to instruct it to keep the
ignore regexes between calls and release them explicitly at the end.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
Test missing because I couldn't see any effect of -I on range-diff.
range-diff.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/range-diff.c b/range-diff.c
index e731525e66..cac89a2f4f 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -482,6 +482,7 @@ static void output(struct string_list *a, struct string_list *b,
else
diff_setup(&opts);
+ opts.no_free = 1;
if (!opts.output_format)
opts.output_format = DIFF_FORMAT_PATCH;
opts.flags.suppress_diff_headers = 1;
@@ -542,6 +543,8 @@ static void output(struct string_list *a, struct string_list *b,
strbuf_release(&buf);
strbuf_release(&dashes);
strbuf_release(&indent);
+ opts.no_free = 0;
+ diff_free(&opts);
}
int show_range_diff(const char *range1, const char *range2,
--
2.33.0
next prev parent reply other threads:[~2021-09-04 7:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 18:49 [BUG?] git range-diff -Ix @{1}... segfaults Junio C Hamano
2021-09-04 7:50 ` René Scharfe [this message]
2021-09-07 20:05 ` Junio C Hamano
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=7ac58fa9-f0f3-53bc-e51b-de9cd4efdb29@web.de \
--to=l.s.r@web.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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).