proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 06:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1945 from libgit2/ntk/fix/merge_leaks

Browse Source 
Plug git_merge() related leaks
This commit is contained in:
Vicent Martí 2013-11-05 08:32:09 -08:00
commit 74e06c05b5
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/merge.c
View File

@ -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:

2
tests-clar/merge/workdir/setup.c
View File

@ -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)
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);
} }