diff options
| author | Lars Hjemli | 2009-02-01 19:29:24 +0100 |
|---|---|---|
| committer | Lars Hjemli | 2009-02-01 19:29:24 +0100 |
| commit | 481ce5e298e2dcd7edc1d4a30e523dda2ce58b01 (patch) | |
| tree | b5a2acddf2403fcbaecc17b206ec44044a30cf27 | |
| parent | ui-tree: show hexdump of binary blobs (diff) | |
| download | cgit-481ce5e298e2dcd7edc1d4a30e523dda2ce58b01.tar.gz cgit-481ce5e298e2dcd7edc1d4a30e523dda2ce58b01.zip | |
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>
| -rw-r--r-- | shared.c | 4 |
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, | |||
| 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 | } |