diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-02-16 13:56:29 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-02-17 00:50:37 +0300 |
commit | 6ee36364eb32287f071878a91d3bbcd86313754a (patch) | |
tree | f506d1f0dbdc05f8c81c042faa7d9fecbfdef9cf /diff.c | |
parent | 244c27242f44e6b88e3a381c90bde08d134c274b (diff) |
diff.[ch]: have diff_free() free options->parseopts
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@gmail.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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) |