diff.[ch]: have diff_free() free options->parseopts

avar · gitster · commit 6ee36364eb32 · 2022-02-16T13:50:37.000-08:00
The "struct option" added in 4a28847 (diff.c: prepare to use parse_options() for parsing, 2019-01-27) would be free'd in the case of diff_setup_done() being called. But not all codepaths that allocate it reach that, e.g. "t6427-diff3-conflict-markers.sh" will now free memory that it didn't free before. By using FREE_AND_NULL() here (which diff_setup_done() also does) we ensure that we free the memory, and that we won't have double-free's. Before this running: ./t6427-diff3-conflict-markers.sh -vixd --run=7 Would report: SUMMARY: LeakSanitizer: 7823 byte(s) leaked in 6 allocation(s). But now we'll report: SUMMARY: LeakSanitizer: 703 byte(s) leaked in 5 allocation(s). I.e. the largest leak in that particular test has now been addressed. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/diff.c b/diff.c
@@ -6346,6 +6346,7 @@ void diff_free(struct diff_options *options)
 	diff_free_file(options);
 	diff_free_ignore_regex(options);
 	clear_pathspec(&options->pathspec);
+	FREE_AND_NULL(options->parseopts);
 }
 
 void diff_flush(struct diff_options *options)

Original file line number	Diff line number	Diff line change
`@@ -6346,6 +6346,7 @@ void diff_free(struct diff_options *options)`
`6346`	`6346`	`diff_free_file(options);`
`6347`	`6347`	`diff_free_ignore_regex(options);`
`6348`	`6348`	`clear_pathspec(&options->pathspec);`
	`6349`	`+ FREE_AND_NULL(options->parseopts);`
`6349`	`6350`	`}`
`6350`	`6351`
`6351`	`6352`	`void diff_flush(struct diff_options *options)`