diff options
| author | Davey Shafik <me@daveyshafik.com> | 2016-11-30 15:05:54 -0800 |
|---|---|---|
| committer | Davey Shafik <me@daveyshafik.com> | 2016-11-30 15:05:54 -0800 |
| commit | be556555cc4f41798a880fde52920f0b29518fd7 (patch) | |
| tree | 03a75f73c5ea6da5989f4aeca3078fc64ade1020 /ext/pcre/php_pcre.c | |
| parent | 9efea0c23eb0bd8f92c97cc39954fd3cdb366e8b (diff) | |
| parent | e89a0535a3d8f2a09e3b28c3e70d7181819d6ec5 (diff) | |
| download | php-git-be556555cc4f41798a880fde52920f0b29518fd7.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.1.0
* PHP-7.1: (64 commits)
Update NEWS for the build
Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on).
Fixed calling generators through magic __call()
add NEWS
Fix #73549: Use after free when stream is passed to imagepng
Update UPGRADING with info about AEAD changes in openssl_(en|de)crypt
Do not add extra timeval entropy when OpenSSL 1.1 used
Clean up and fix php_openssl_dh_pub_from_priv
Fix occasionaly failing test
Added missing array key to $JUNIT
acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS.
Add more mbfl string size checks (bug #73505)
Add more mbfl string size checks (bug #73505)
Fix #73612: preg_*() may leak memory
Fix more size_t/int implicit conversions
Fix int/size_t confusion in isValidPharFilename (bug #73580)
Fix more size_t/int implicit conversions
Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phpt
Fix int/size_t confusion in isValidPharFilename (bug #73580)
add test for bug #57547
...
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index c882a09238..6bcaf17d68 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -726,7 +726,7 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, int subjec /* Overwrite the passed-in value for subpatterns with an empty array. */ if (subpats != NULL) { - zval_dtor(subpats); + zval_ptr_dtor(subpats); array_init(subpats); } @@ -1592,7 +1592,7 @@ static PHP_FUNCTION(preg_replace) replace_count = preg_replace_impl(return_value, regex, replace, subject, limit, 0, 0); if (zcount) { - zval_dtor(zcount); + zval_ptr_dtor(zcount); ZVAL_LONG(zcount, replace_count); } } @@ -1627,7 +1627,7 @@ static PHP_FUNCTION(preg_replace_callback) replace_count = preg_replace_impl(return_value, regex, replace, subject, limit, 1, 0); if (zcount) { - zval_dtor(zcount); + zval_ptr_dtor(zcount); ZVAL_LONG(zcount, replace_count); } } @@ -1689,7 +1689,7 @@ static PHP_FUNCTION(preg_replace_callback_array) } ZEND_HASH_FOREACH_END(); if (zcount) { - zval_dtor(zcount); + zval_ptr_dtor(zcount); ZVAL_LONG(zcount, replace_count); } } @@ -1720,7 +1720,7 @@ static PHP_FUNCTION(preg_filter) replace_count = preg_replace_impl(return_value, regex, replace, subject, limit, 0, 1); if (zcount) { - zval_dtor(zcount); + zval_ptr_dtor(zcount); ZVAL_LONG(zcount, replace_count); } } |