diff options
| author | René Scharfe <l.s.r@web.de> | 2021-09-04 07:50:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-07 20:03:13 (GMT) |
| commit | 709b3f32d333df1e29dbb073b4e9e834f130a989 (patch) | |
| tree | c06e851e11818e8641e8a2bb96a5adff8bfc7828 /range-diff.c | |
| parent | 225bc32a989d7a22fa6addafd4ce7dcd04675dbf (diff) | |
| download | git-709b3f32d333df1e29dbb073b4e9e834f130a989.zip git-709b3f32d333df1e29dbb073b4e9e834f130a989.tar.gz git-709b3f32d333df1e29dbb073b4e9e834f130a989.tar.bz2 | |
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'range-diff.c')
| -rw-r--r-- | range-diff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/range-diff.c b/range-diff.c index e947979..a315c4c 100644 --- a/range-diff.c +++ b/range-diff.c @@ -485,6 +485,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; @@ -545,6 +546,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, |