diff-lib: plug minor memory leaks in do_diff_cache()
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Nov 14, 2020 at 19:37 UTC
d44e5267eaefb27521e4ed2655358b0282add239
1 file changed
+2
diff-lib.c
+2
@@ -536,10 +536,12 @@ int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt)
536
537
repo_init_revisions(opt->repo, &revs, NULL);
538
copy_pathspec(&revs.prune_data, &opt->pathspec);
539
+ diff_setup_done(&revs.diffopt);
540
revs.diffopt = *opt;
541
542
if (diff_cache(&revs, tree_oid, NULL, 1))
543
exit(128);
544
+ clear_pathspec(&revs.prune_data);
545
return 0;
546
}
547