From 7a02e93e02f34befa493405b6287595a0ccaef79 Mon Sep 17 00:00:00 2001 From: Vicent Marti Date: Tue, 27 Oct 2015 22:42:40 +0100 Subject: merge: Plug memory leak --- src/merge.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/merge.c b/src/merge.c index 29184f67b..186c77037 100644 --- a/src/merge.c +++ b/src/merge.c @@ -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, (opts.tree_flags & GIT_MERGE_TREE_SKIP_REUC)); done: + if (!given_opts || !given_opts->metric) + git__free(opts.metric); + git_merge_diff_list__free(diff_list); git_iterator_free(empty_ancestor); git_iterator_free(empty_ours); -- cgit v1.2.1