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

merge: fix memory leak

Browse Source
This commit is contained in:
Patrick Steinhardt 2016-02-08 16:58:08 +01:00
parent 0f814deb36
commit fac42ff942
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/merge.c
View File

@ -1985,9 +1985,6 @@ static int create_virtual_base(
git_index *index = NULL; git_index *index = NULL;
git_merge_options virtual_opts = GIT_MERGE_OPTIONS_INIT; git_merge_options virtual_opts = GIT_MERGE_OPTIONS_INIT;
result = git__calloc(1, sizeof(git_annotated_commit));
GITERR_CHECK_ALLOC(result);
/* Conflicts in the merge base creation do not propagate to conflicts /* Conflicts in the merge base creation do not propagate to conflicts
* in the result; the conflicted base will act as the common ancestor. * in the result; the conflicted base will act as the common ancestor.
*/ */
@ -2001,6 +1998,8 @@ static int create_virtual_base(
recursion_level + 1, &virtual_opts)) < 0) recursion_level + 1, &virtual_opts)) < 0)
return -1; return -1;
result = git__calloc(1, sizeof(git_annotated_commit));
GITERR_CHECK_ALLOC(result);
result->type = GIT_ANNOTATED_COMMIT_VIRTUAL; result->type = GIT_ANNOTATED_COMMIT_VIRTUAL;
result->index = index; result->index = index;