mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

range-diff: avoid segfault with -I

Browse Source 
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>
This commit is contained in:
René Scharfe
2021-09-04 09:50:58 +02:00
committed by Junio C Hamano
parent 225bc32a98
commit 709b3f32d3
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
range-diff.c
View File

@ -485,6 +485,7 @@ static void output(struct string_list *a, struct string_list *b,
else else
diff_setup(&opts); diff_setup(&opts);
opts.no_free = 1;
if (!opts.output_format) if (!opts.output_format)
opts.output_format = DIFF_FORMAT_PATCH; opts.output_format = DIFF_FORMAT_PATCH;
opts.flags.suppress_diff_headers = 1; 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(&buf);
strbuf_release(&dashes); strbuf_release(&dashes);
strbuf_release(&indent); strbuf_release(&indent);
opts.no_free = 0;
diff_free(&opts);
} }
int show_range_diff(const char *range1, const char *range2, int show_range_diff(const char *range1, const char *range2,