mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 16:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Lars Hjemli 2010-04-08 00:50:20 +02:00
commit 023d933121
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shared.c
View File

@ -279,6 +279,10 @@ int cgit_diff_files(const unsigned char *old_sha1,
if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
(file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
*binary = 1; *binary = 1;
if (file1.size)
free(file1.ptr);
if (file2.size)
free(file2.ptr);
return 0; return 0;
} }
@ -291,6 +295,10 @@ int cgit_diff_files(const unsigned char *old_sha1,
emit_cb.outf = filediff_cb; emit_cb.outf = filediff_cb;
emit_cb.priv = fn; emit_cb.priv = fn;
xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
if (file1.size)
free(file1.ptr);
if (file2.size)
free(file2.ptr);
return 0; return 0;
} }