From: Stefan Beller <sbeller@google.com>
Date: Sat, 21 Mar 2015 00:28:04 +0000 (-0700)
Subject: merge-recursive: fix memleaks
X-Git-Tag: v2.4.0-rc1~9^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=473091e21ef2dbee6087cdf0429858faf2b50740;p=git

merge-recursive: fix memleaks

These string_list instances were allocated by get_renames() and
get_unmerged for the sole use of this caller, and the function is
responsible for freeing them, not just their contents.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index 771f5e21b0..1c9c30db6c 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1858,6 +1858,9 @@ int merge_trees(struct merge_options *o,
 		string_list_clear(re_head, 0);
 		string_list_clear(entries, 1);
 
+		free(re_merge);
+		free(re_head);
+		free(entries);
 	}
 	else
 		clean = 1;