Skip to content

G
git2
Commit 8d22773f by nulltoken
Options

Plug git_merge() related leaks

parent 453e6b3e
Showing with 3 additions and 0 deletions
src/merge.c
...@@ -2451,6 +2451,7 @@ int git_merge( ...@@ -2451,6 +2451,7 @@ int git_merge(
on_error: on_error:
git_repository_merge_cleanup(repo); git_repository_merge_cleanup(repo);
git_index_free(index_new);
git__free(result); git__free(result);
done: done:
......
tests-clar/merge/workdir/setup.c
...@@ -1019,6 +1019,7 @@ void test_merge_workdir_setup__retained_after_success(void) ...@@ -1019,6 +1019,7 @@ void test_merge_workdir_setup__retained_after_success(void)
git_merge_head_free(our_head); git_merge_head_free(our_head);
git_merge_head_free(their_heads[0]); git_merge_head_free(their_heads[0]);
git_merge_result_free(result);
} }
void test_merge_workdir_setup__removed_after_failure(void) void test_merge_workdir_setup__removed_after_failure(void)
...@@ -1051,4 +1052,5 @@ void test_merge_workdir_setup__removed_after_failure(void) ...@@ -1051,4 +1052,5 @@ void test_merge_workdir_setup__removed_after_failure(void)
git_merge_head_free(our_head); git_merge_head_free(our_head);
git_merge_head_free(their_heads[0]); git_merge_head_free(their_heads[0]);
git_merge_result_free(result);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment