author | Lars Hjemli <hjemli@gmail.com> | 2010-04-07 22:50:20 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-04-07 22:50:20 (UTC) |
commit | 023d933121ca7352a069f3886caf6fbe958ba27d (patch) (unidiff) | |
tree | acd2c755148eacf0c0b542fb8c143b480514f66e /shared.c | |
parent | ff3a3b4e2b7463bb8cb370bdda393e8b3526fcb9 (diff) | |
parent | ce761fde0772236a11b41270f9254c515f724ad5 (diff) | |
download | cgit-023d933121ca7352a069f3886caf6fbe958ba27d.zip cgit-023d933121ca7352a069f3886caf6fbe958ba27d.tar.gz cgit-023d933121ca7352a069f3886caf6fbe958ba27d.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | shared.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -280,4 +280,8 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
280 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { | 280 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
281 | *binary = 1; | 281 | *binary = 1; |
282 | if (file1.size) | ||
283 | free(file1.ptr); | ||
284 | if (file2.size) | ||
285 | free(file2.ptr); | ||
282 | return 0; | 286 | return 0; |
283 | } | 287 | } |
@@ -292,4 +296,8 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
292 | emit_cb.priv = fn; | 296 | emit_cb.priv = fn; |
293 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 297 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
298 | if (file1.size) | ||
299 | free(file1.ptr); | ||
300 | if (file2.size) | ||
301 | free(file2.ptr); | ||
294 | return 0; | 302 | return 0; |
295 | } | 303 | } |