Skip to content

Commit 187ba43

Browse files
committed
Fix ASAN warning (Zend/zend_string.h:165:2: runtime error: null pointer passed as argument 2 of memcpy(), which is declared to never be null)
1 parent 4f478af commit 187ba43

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

ext/phar/util.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,11 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t
13891389
zend_string *str;
13901390

13911391
ZVAL_STRINGL(&openssl, is_sign ? "openssl_sign" : "openssl_verify", is_sign ? sizeof("openssl_sign")-1 : sizeof("openssl_verify")-1);
1392-
ZVAL_STRINGL(&zp[1], *signature, *signature_len);
1392+
if (*signature_len) {
1393+
ZVAL_STRINGL(&zp[1], *signature, *signature_len);
1394+
} else {
1395+
ZVAL_EMPTY_STRING(&zp[1]);
1396+
}
13931397
ZVAL_STRINGL(&zp[2], key, key_len);
13941398
php_stream_rewind(fp);
13951399
str = php_stream_copy_to_mem(fp, (size_t) end, 0);

0 commit comments

Comments
 (0)