On Wed, Feb 16, 2022 at 7:59 AM Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> wrote: > > The "struct option" added in 4a288478394 (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@xxxxxxxxx> > --- > diff.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/diff.c b/diff.c > index 0aef3db6e10..fb8bc8aadbf 100644 > --- 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) > -- > 2.35.1.1028.g2d2d4be19de Makes sense.
