mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-19 01:18:27 +02:00
Code

checkout, read-tree: fix leak of unpack_trees_options.dir

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2021-09-27 16:33:39 +00:00 committed by Junio C Hamano
parent 446cc5544a
commit c512d27e78
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/checkout.c
View File

@ -760,6 +760,10 @@ static int merge_working_tree(const struct checkout_opts *opts,
init_tree_desc(&trees[1], tree->buffer, tree->size);
ret = unpack_trees(2, trees, &topts);
if (topts.dir) {
dir_clear(topts.dir);
FREE_AND_NULL(topts.dir);
}
clear_unpack_trees_porcelain(&topts);
if (ret == -1) {
/*

5
builtin/read-tree.c
View File

@ -250,6 +250,11 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
if (unpack_trees(nr_trees, t, &opts))
return 128;
if (opts.dir) {
dir_clear(opts.dir);
FREE_AND_NULL(opts.dir);
}
if (opts.debug_unpack || opts.dry_run)
return 0; /* do not write the index out */