summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-02-01 18:29:24 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-02-01 18:29:24 (UTC)
commit481ce5e298e2dcd7edc1d4a30e523dda2ce58b01 (patch) (side-by-side diff)
treeb5a2acddf2403fcbaecc17b206ec44044a30cf27
parentae1d4d75b2a2eb3534ff4b3685cc5c0b80007ef7 (diff)
downloadcgit-481ce5e298e2dcd7edc1d4a30e523dda2ce58b01.zip
cgit-481ce5e298e2dcd7edc1d4a30e523dda2ce58b01.tar.gz
cgit-481ce5e298e2dcd7edc1d4a30e523dda2ce58b01.tar.bz2
shared.c: avoid SEGFAULT when checking for binary buffers
Before calling buffer_is_binary() we need to verify that the buffer is valid. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--shared.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/shared.c b/shared.c
index dbb84d8..cce0af4 100644
--- a/shared.c
+++ b/shared.c
@@ -258,34 +258,34 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
int cgit_diff_files(const unsigned char *old_sha1,
const unsigned char *new_sha1, unsigned long *old_size,
unsigned long *new_size, int *binary, linediff_fn fn)
{
mmfile_t file1, file2;
xpparam_t diff_params;
xdemitconf_t emit_params;
xdemitcb_t emit_cb;
if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
return 1;
*old_size = file1.size;
*new_size = file2.size;
- if (buffer_is_binary(file1.ptr, file1.size) ||
- buffer_is_binary(file2.ptr, file2.size)) {
+ if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
+ (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
*binary = 1;
return 0;
}
memset(&diff_params, 0, sizeof(diff_params));
memset(&emit_params, 0, sizeof(emit_params));
memset(&emit_cb, 0, sizeof(emit_cb));
diff_params.flags = XDF_NEED_MINIMAL;
emit_params.ctxlen = 3;
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);
return 0;
}