diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-10-28 21:21:35 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-10-28 21:21:35 +0800 |
| commit | 7778bdcd04669f840fb16ebe3d867637d35b2d4f (patch) | |
| tree | 55840d90126c0ecbf4b759a0d1e97406cd037333 /ext/pcre/php_pcre.c | |
| parent | 2e2433531bccd63365b9ce82be213847f2f04961 (diff) | |
| parent | e5aa3651470e5f741b16d4f3cd55b7ae6ac5d23a (diff) | |
| download | php-git-7778bdcd04669f840fb16ebe3d867637d35b2d4f.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73392 (A use-after-free in zend allocator management)
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 53e122c82b..214904f1b5 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1523,7 +1523,10 @@ static int preg_replace_impl(zval *return_value, zval *regex, zval *replace, zva RETVAL_STR(result); } else { zend_string_release(result); + RETVAL_NULL(); } + } else { + RETVAL_NULL(); } } @@ -1616,7 +1619,6 @@ static PHP_FUNCTION(preg_replace_callback_array) Z_PARAM_ZVAL_EX(zcount, 0, 1) ZEND_PARSE_PARAMETERS_END(); - ZVAL_UNDEF(&zv); ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(pattern), str_idx, replace) { if (str_idx) { ZVAL_STR_COPY(®ex, str_idx); @@ -1645,10 +1647,6 @@ static PHP_FUNCTION(preg_replace_callback_array) zval_ptr_dtor(®ex); - if (Z_ISUNDEF(zv)) { - RETURN_NULL(); - } - ZVAL_COPY_VALUE(return_value, &zv); if (UNEXPECTED(EG(exception))) { |