Re: [PATCH 2/3] revision: clear decoration structs during release_revisions()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 5, 2023, 23:00 UTC
- Message-ID
- <xmqq34yoekt5.fsf@gitster.g>
- In-Reply-To
- <20231005213014.GB986467@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
Wow, nested maze of callbacks make my head spin ;-) but they all look reasonable. Thanks.
Show 68 quoted lines
> diff --git a/line-log.c b/line-log.c
> index 790ab73212..24a1ecb677 100644
> --- a/line-log.c
> +++ b/line-log.c
> @@ -1327,3 +1327,13 @@ int line_log_filter(struct rev_info *rev)
>
> return 0;
> }
> +
> +static void free_void_line_log_data(void *data)
> +{
> + free_line_log_data(data);
> +}
> +
> +void line_log_free(struct rev_info *rev)
> +{
> + clear_decoration(&rev->line_log_data, free_void_line_log_data);
> +}
> diff --git a/line-log.h b/line-log.h
> index adff361b1b..4291da8d79 100644
> --- a/line-log.h
> +++ b/line-log.h
> @@ -60,4 +60,6 @@ int line_log_process_ranges_arbitrary_commit(struct rev_info *rev,
>
> int line_log_print(struct rev_info *rev, struct commit *commit);
>
> +void line_log_free(struct rev_info *rev);
> +
> #endif /* LINE_LOG_H */
> diff --git a/revision.c b/revision.c
> index e789834dd1..219dc76716 100644
> --- a/revision.c
> +++ b/revision.c
> @@ -3083,6 +3083,11 @@ static void release_revisions_mailmap(struct string_list *mailmap)
>
> static void release_revisions_topo_walk_info(struct topo_walk_info *info);
>
> +static void free_void_commit_list(void *list)
> +{
> + free_commit_list(list);
> +}
> +
> void release_revisions(struct rev_info *revs)
> {
> free_commit_list(revs->commits);
> @@ -3100,6 +3105,10 @@ void release_revisions(struct rev_info *revs)
> diff_free(&revs->pruning);
> reflog_walk_info_release(revs->reflog_info);
> release_revisions_topo_walk_info(revs->topo_walk_info);
> + clear_decoration(&revs->children, free_void_commit_list);
> + clear_decoration(&revs->merge_simplification, free);
> + clear_decoration(&revs->treesame, free);
> + line_log_free(revs);
> }
>
> static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
> diff --git a/t/t4217-log-limit.sh b/t/t4217-log-limit.sh
> index 6e01e2629c..613f0710e9 100755
> --- a/t/t4217-log-limit.sh
> +++ b/t/t4217-log-limit.sh
> @@ -2,6 +2,7 @@
>
> test_description='git log with filter options limiting the output'
>
> +TEST_PASSES_SANITIZE_LEAK=true
> . ./test-lib.sh
>
> test_expect_success 'setup test' '