summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-09 06:31:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-09 06:31:51 (GMT)
commit7ec1eb93f779d06efac106cd1998410932f3c9b2 (patch)
tree5c6ca3d326b0ccb8cc09064306bb3a591d7b3349 /diff.c
parentdcc30eb2c780f009af36f87d6c4ff484eeec5bec (diff)
parentaed6ca52e73a35d0aac9aba7d631e09983e46a6f (diff)
downloadgit-7ec1eb93f779d06efac106cd1998410932f3c9b2.zip
git-7ec1eb93f779d06efac106cd1998410932f3c9b2.tar.gz
git-7ec1eb93f779d06efac106cd1998410932f3c9b2.tar.bz2
Merge early parts of jk/cached-textconv
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 167e6a4..a1bf1e9 100644
--- a/diff.c
+++ b/diff.c
@@ -551,6 +551,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((char *)data_one);
+ if (textconv_two)
+ free((char *)data_two);
}
struct diff_words_buffer {