summaryrefslogtreecommitdiff
path: root/shared.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-02-01 19:29:24 +0100
committerLars Hjemli <hjemli@gmail.com>2009-02-01 19:29:24 +0100
commit481ce5e298e2dcd7edc1d4a30e523dda2ce58b01 (patch)
treeb5a2acddf2403fcbaecc17b206ec44044a30cf27 /shared.c
parentae1d4d75b2a2eb3534ff4b3685cc5c0b80007ef7 (diff)
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 (limited to 'shared.c')
-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
@@ -271,8 +271,8 @@ int cgit_diff_files(const unsigned char *old_sha1,
*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;
}