checkout, read-tree: fix leak of unpack_trees_options.dir
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Sep 27, 2021 at 16:33 UTC
c512d27e787e9eb325731ab6aa7ac126f8cf6126
2 files changed
+9
builtin/checkout.c
+4
@@ -760,6 +760,10 @@ static int merge_working_tree(const struct checkout_opts *opts,
760
init_tree_desc(&trees[1], tree->buffer, tree->size);
761
762
ret = unpack_trees(2, trees, &topts);
763
+ if (topts.dir) {
764
+ dir_clear(topts.dir);
765
+ FREE_AND_NULL(topts.dir);
766
+ }
767
clear_unpack_trees_porcelain(&topts);
768
if (ret == -1) {
769
/*
builtin/read-tree.c
+5
@@ -250,6 +250,11 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
250
if (unpack_trees(nr_trees, t, &opts))
251
return 128;
252
253
+ if (opts.dir) {
254
+ dir_clear(opts.dir);
255
+ FREE_AND_NULL(opts.dir);
256
+ }
257
+
258
if (opts.debug_unpack || opts.dry_run)
259
return 0; /* do not write the index out */
260