Unidiff1 files changed, 2 insertions, 2 deletions
|
diff --git a/shared.c b/shared.c index dbb84d8..cce0af4 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -266,18 +266,18 @@ int cgit_diff_files(const unsigned char *old_sha1, |
266 | xdemitcb_t emit_cb; |
266 | xdemitcb_t emit_cb; |
267 | |
267 | |
268 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
268 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
269 | return 1; |
269 | return 1; |
270 | |
270 | |
271 | *old_size = file1.size; |
271 | *old_size = file1.size; |
272 | *new_size = file2.size; |
272 | *new_size = file2.size; |
273 | |
273 | |
274 | if (buffer_is_binary(file1.ptr, file1.size) || |
274 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
275 | buffer_is_binary(file2.ptr, file2.size)) { |
275 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
276 | *binary = 1; |
276 | *binary = 1; |
277 | return 0; |
277 | return 0; |
278 | } |
278 | } |
279 | |
279 | |
280 | memset(&diff_params, 0, sizeof(diff_params)); |
280 | memset(&diff_params, 0, sizeof(diff_params)); |
281 | memset(&emit_params, 0, sizeof(emit_params)); |
281 | memset(&emit_params, 0, sizeof(emit_params)); |
282 | memset(&emit_cb, 0, sizeof(emit_cb)); |
282 | memset(&emit_cb, 0, sizeof(emit_cb)); |
283 | diff_params.flags = XDF_NEED_MINIMAL; |
283 | diff_params.flags = XDF_NEED_MINIMAL; |
|