summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2010-04-07 22:50:20 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-04-07 22:50:20 (UTC)
commit023d933121ca7352a069f3886caf6fbe958ba27d (patch) (side-by-side diff)
treeacd2c755148eacf0c0b542fb8c143b480514f66e
parentff3a3b4e2b7463bb8cb370bdda393e8b3526fcb9 (diff)
parentce761fde0772236a11b41270f9254c515f724ad5 (diff)
downloadcgit-023d933121ca7352a069f3886caf6fbe958ba27d.zip
cgit-023d933121ca7352a069f3886caf6fbe958ba27d.tar.gz
cgit-023d933121ca7352a069f3886caf6fbe958ba27d.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/shared.c b/shared.c
index 5f46793..83b71e6 100644
--- a/shared.c
+++ b/shared.c
@@ -278,8 +278,12 @@ int cgit_diff_files(const unsigned char *old_sha1,
if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
(file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
*binary = 1;
+ if (file1.size)
+ free(file1.ptr);
+ if (file2.size)
+ free(file2.ptr);
return 0;
}
memset(&diff_params, 0, sizeof(diff_params));
@@ -290,8 +294,12 @@ int cgit_diff_files(const unsigned char *old_sha1,
emit_params.flags = XDL_EMIT_FUNCNAMES;
emit_cb.outf = filediff_cb;
emit_cb.priv = fn;
xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
+ if (file1.size)
+ free(file1.ptr);
+ if (file2.size)
+ free(file2.ptr);
return 0;
}
void cgit_diff_tree(const unsigned char *old_sha1,