proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 22:39:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge: Plug memory leak

Browse Source
This commit is contained in:
Vicent Marti 2015-10-27 22:42:40 +01:00
parent a1f5d691a2
commit 7a02e93e02
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/merge.c
View File

@ -1726,13 +1726,13 @@ int git_merge__iterators(
} }
} }
if (!given_opts || !given_opts->metric)
git__free(opts.metric);
error = index_from_diff_list(out, diff_list, error = index_from_diff_list(out, diff_list,
(opts.tree_flags & GIT_MERGE_TREE_SKIP_REUC)); (opts.tree_flags & GIT_MERGE_TREE_SKIP_REUC));
done: done:
if (!given_opts || !given_opts->metric)
git__free(opts.metric);
git_merge_diff_list__free(diff_list); git_merge_diff_list__free(diff_list);
git_iterator_free(empty_ancestor); git_iterator_free(empty_ancestor);
git_iterator_free(empty_ours); git_iterator_free(empty_ours);