From: Jeff King <peff@peff.net>
Date: Fri, 2 Apr 2010 00:04:14 +0000 (-0400)
Subject: fix textconv leak in emit_rewrite_diff
X-Git-Tag: v1.7.1-rc1~5^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b76c056b95ccb15ae3b0723da983914de88b4bae;p=git.git

fix textconv leak in emit_rewrite_diff

We correctly free() for the normal diff case, but leak for
rewrite diffs.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/diff.c b/diff.c
index 2daa732a3..db2cd5d35 100644
--- a/diff.c
+++ b/diff.c
@@ -550,6 +550,10 @@ static void emit_rewrite_diff(const char *name_a,
 		emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
 	if (lc_b)
 		emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
+	if (textconv_one)
+		free(data_one);
+	if (textconv_two)
+		free(data_two);
 }
 
 struct diff_words_buffer {