diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2021-03-04 17:27:26 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2021-03-04 17:27:26 +0300 |
| commit | 187ba4353a2f62d9400ead603ddf7112dc4e855c (patch) | |
| tree | b2de18d94e9e917bf4bed34a87d7e0a9075055cc | |
| parent | 4f478af16d24fd9302af352be79514339371fb0b (diff) | |
| download | php-git-187ba4353a2f62d9400ead603ddf7112dc4e855c.tar.gz | |
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)
| -rw-r--r-- | ext/phar/util.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/phar/util.c b/ext/phar/util.c index b45251d14a..59362bbc72 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -1389,7 +1389,11 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t zend_string *str; ZVAL_STRINGL(&openssl, is_sign ? "openssl_sign" : "openssl_verify", is_sign ? sizeof("openssl_sign")-1 : sizeof("openssl_verify")-1); - ZVAL_STRINGL(&zp[1], *signature, *signature_len); + if (*signature_len) { + ZVAL_STRINGL(&zp[1], *signature, *signature_len); + } else { + ZVAL_EMPTY_STRING(&zp[1]); + } ZVAL_STRINGL(&zp[2], key, key_len); php_stream_rewind(fp); str = php_stream_copy_to_mem(fp, (size_t) end, 0); |