[PATCH] diff-lib: plug minor memory leaks in do_diff_cache()
- From
René Scharfe <l.s.r@web.de>
- Date
- Nov 14, 2020, 18:37 UTC
- Message-ID
- <80fb4a2a-992f-7d3b-9413-5059da3a8f01@web.de>
do_diff_cache() builds a struct rev_info to hand to diff_cache() from scratch by initializing it using repo_init_revisions() and then replacing its diffopt and prune_data members.
The diffopt member is initialized to a heap-allocated list of options, though. Release it using diff_setup_done() before overwriting it.
The initial value of the prune_data member doesn't need to be released, but the copy created using copy_pathspec() does. Clear it after use.
Signed-off-by: René Scharfe <l.s.r@web.de> --- diff-lib.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/diff-lib.c b/diff-lib.c index 082e249fc3..b73cc1859a 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -606,10 +606,12 @@ int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt) repo_init_revisions(opt->repo, &revs, NULL); copy_pathspec(&revs.prune_data, &opt->pathspec); + diff_setup_done(&revs.diffopt); revs.diffopt = *opt; if (diff_cache(&revs, tree_oid, NULL, 1)) exit(128); + clear_pathspec(&revs.prune_data); return 0; } -- 2.29.2