cgit

commit 481ce5e298e2dcd7edc1d4a30e523dda2ce58b01

Author: Lars Hjemli <hjemli@gmail.com>

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>

 shared.c | 4 ++--


diff --git a/shared.c b/shared.c
index dbb84d84cae97790426df67f61cd4cb305a39dce..cce0af40db29b77527fe1f6a7a897b4076c9621b 100644
--- a/shared.c
+++ b/shared.c
@@ -271,8 +271,8 @@
 	*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;
 	}