diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-04-09 08:31:27 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-04-09 08:31:51 +0200 |
commit | 7ec1eb93f779d06efac106cd1998410932f3c9b2 (patch) | |
tree | 5c6ca3d326b0ccb8cc09064306bb3a591d7b3349 /diff.c | |
parent | Merge branch 'maint' (diff) | |
parent | diff.c: work around pointer constness warnings (diff) | |
download | git-7ec1eb93f779d06efac106cd1998410932f3c9b2.tar.xz git-7ec1eb93f779d06efac106cd1998410932f3c9b2.zip |
Merge early parts of jk/cached-textconv
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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 { |