summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornulltoken <emeric.fermas@gmail.com>2013-11-05 16:44:10 +0100
committernulltoken <emeric.fermas@gmail.com>2013-11-05 17:30:11 +0100
commit8d22773f4b2364b4cdc631a2d7db065834f80433 (patch)
treed0df6dc9ce7e8804155b94a0b3248028a465583a /src
parent453e6b3ec0dcf5c81de7fe219e587fa140b9c346 (diff)
downloadlibgit2-8d22773f4b2364b4cdc631a2d7db065834f80433.tar.gz
Plug git_merge() related leaks
Diffstat (limited to 'src')
-rw-r--r--src/merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/merge.c b/src/merge.c
index 973d4445c..2cbf531f9 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -2451,6 +2451,7 @@ int git_merge(
on_error:
git_repository_merge_cleanup(repo);
+ git_index_free(index_new);
git__free(result);
done: