summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2015-10-27 22:42:40 +0100
committerVicent Marti <tanoku@gmail.com>2015-10-27 22:44:26 +0100
commit7a02e93e02f34befa493405b6287595a0ccaef79 (patch)
treeee42ec8d2a2a54d3ba0c26e5d8cb2a18c73f2cf4
parenta1f5d691a2bcaa83f60500b98ce5f393e7c03ad9 (diff)
downloadlibgit2-vmg/reuc-insert.tar.gz
merge: Plug memory leakvmg/reuc-insert
-rw-r--r--src/merge.c6
1 files 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);