|
diff --git a/shared.c b/shared.c index 5f46793..83b71e6 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -274,28 +274,36 @@ int cgit_diff_files(const unsigned char *old_sha1, |
274 | return 1; |
274 | return 1; |
275 | |
275 | |
276 | *old_size = file1.size; |
276 | *old_size = file1.size; |
277 | *new_size = file2.size; |
277 | *new_size = file2.size; |
278 | |
278 | |
279 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
279 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
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 | } |
284 | |
288 | |
285 | memset(&diff_params, 0, sizeof(diff_params)); |
289 | memset(&diff_params, 0, sizeof(diff_params)); |
286 | memset(&emit_params, 0, sizeof(emit_params)); |
290 | memset(&emit_params, 0, sizeof(emit_params)); |
287 | memset(&emit_cb, 0, sizeof(emit_cb)); |
291 | memset(&emit_cb, 0, sizeof(emit_cb)); |
288 | diff_params.flags = XDF_NEED_MINIMAL; |
292 | diff_params.flags = XDF_NEED_MINIMAL; |
289 | emit_params.ctxlen = 3; |
293 | emit_params.ctxlen = 3; |
290 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
294 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
291 | emit_cb.outf = filediff_cb; |
295 | emit_cb.outf = filediff_cb; |
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 | } |
296 | |
304 | |
297 | void cgit_diff_tree(const unsigned char *old_sha1, |
305 | void cgit_diff_tree(const unsigned char *old_sha1, |
298 | const unsigned char *new_sha1, |
306 | const unsigned char *new_sha1, |
299 | filepair_fn fn, const char *prefix) |
307 | filepair_fn fn, const char *prefix) |
300 | { |
308 | { |
301 | struct diff_options opt; |
309 | struct diff_options opt; |
|