summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2018-05-21 14:54:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-22 02:59:31 (GMT)
commit1c41d2805e42d77d943fd3d79ebf5136f74c9ba3 (patch)
treef98278a1446ac08bfb9ada55d3cddb9da6470257 /merge.c
parent342c513a4ae100354097a9ca99a080eeb7e70c0b (diff)
downloadgit-1c41d2805e42d77d943fd3d79ebf5136f74c9ba3.zip
git-1c41d2805e42d77d943fd3d79ebf5136f74c9ba3.tar.gz
git-1c41d2805e42d77d943fd3d79ebf5136f74c9ba3.tar.bz2
unpack_trees_options: free messages when done
The strings allocated in `setup_unpack_trees_porcelain()` are never freed. Provide a function `clear_unpack_trees_porcelain()` to do so and call it where we use `setup_unpack_trees_porcelain()`. The only non-trivial user is `unpack_trees_start()`, where we should place the new call in `unpack_trees_finish()`. We keep the string pointers in an array, mixing pointers to static memory and memory that we allocate on the heap. We also keep several copies of the individual pointers. So we need to make sure that we do not free what we must not free and that we do not double-free. Let a separate argv_array take ownership of all the strings we create so that we can easily free them. Zero the whole array of string pointers to make sure that we do not leave any dangling pointers. Note that we only take responsibility for the memory allocated in `setup_unpack_trees_porcelain()` and not any other members of the `struct unpack_trees_options`. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/merge.c b/merge.c
index f123658..b433291 100644
--- a/merge.c
+++ b/merge.c
@@ -130,8 +130,11 @@ int checkout_fast_forward(const struct object_id *head,
if (unpack_trees(nr_trees, t, &opts)) {
rollback_lock_file(&lock_file);
+ clear_unpack_trees_porcelain(&opts);
return -1;
}
+ clear_unpack_trees_porcelain(&opts);
+
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
return error(_("unable to write new index file"));
return 0;