diff options
| author | Vicent Martà <vicent@github.com> | 2013-11-05 08:32:09 -0800 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-11-05 08:32:09 -0800 |
| commit | 74e06c05b54856e31009b8cbb54ea735ee439381 (patch) | |
| tree | d0df6dc9ce7e8804155b94a0b3248028a465583a | |
| parent | 453e6b3ec0dcf5c81de7fe219e587fa140b9c346 (diff) | |
| parent | 8d22773f4b2364b4cdc631a2d7db065834f80433 (diff) | |
| download | libgit2-74e06c05b54856e31009b8cbb54ea735ee439381.tar.gz | |
Merge pull request #1945 from libgit2/ntk/fix/merge_leaks
Plug git_merge() related leaks
| -rw-r--r-- | src/merge.c | 1 | ||||
| -rw-r--r-- | tests-clar/merge/workdir/setup.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/merge.c b/src/merge.c index 973d4445c..2cbf531f9 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2451,6 +2451,7 @@ int git_merge( on_error: git_repository_merge_cleanup(repo); + git_index_free(index_new); git__free(result); done: diff --git a/tests-clar/merge/workdir/setup.c b/tests-clar/merge/workdir/setup.c index 511106a58..463dee06e 100644 --- a/tests-clar/merge/workdir/setup.c +++ b/tests-clar/merge/workdir/setup.c @@ -1019,6 +1019,7 @@ void test_merge_workdir_setup__retained_after_success(void) git_merge_head_free(our_head); git_merge_head_free(their_heads[0]); + git_merge_result_free(result); } 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(their_heads[0]); + git_merge_result_free(result); } |