com php-src: Fixed bug #69864 (Segfault in preg_replace_cal lback): ext/pcre/php_pcre.c ext/pcre/tests/bug6 9864.phpt
| From: | Christoph Michael Becker | Date: | Tue, 23 Jun 2015 11:00:17 +0000 |
| Subject: | com php-src: Fixed bug #69864 (Segfault in preg_replace_cal lback): ext/pcre/php_pcre.c ext/pcre/tests/bug6 9864.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87464@lists.php.net to get a copy of this message | ||
Commit: a39beaa2514514892d34bc2e9fd89f7333a6ed1f
Author: Christoph M. Becker <cmb@php.net> Tue, 23 Jun 2015 13:00:17 +0200
Parents: b0954ebb79faf53176e528dd9a3038d2a16ab1ef
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a39beaa2514514892d34bc2e9fd89f7333a6ed1f
Log:
Fixed bug #69864 (Segfault in preg_replace_callback)
When preg_replace_callback() is used, cache entries which are in use must not
be removed. We ensure that by deploying a simple refcounting mechanism.
Bugs:
https://bugs.php.net/69864
Changed paths:
M ext/pcre/php_pcre.c
A ext/pcre/tests/bug69864.phpt
Diff:
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index bb78a16..e7274b8 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -169,13 +169,14 @@ static PHP_MSHUTDOWN_FUNCTION(pcre)
/* {{{ static pcre_clean_cache */
static int pcre_clean_cache(void *data, void *arg TSRMLS_DC)
{
+ pcre_cache_entry *pce = (pcre_cache_entry *) data;
int *num_clean = (int *)arg;
- if (*num_clean > 0) {
+ if (*num_clean > 0 && !pce->refcount) {
(*num_clean)--;
- return 1;
+ return ZEND_HASH_APPLY_REMOVE;
} else {
- return 0;
+ return ZEND_HASH_APPLY_KEEP;
}
}
/* }}} */
@@ -446,6 +447,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char *regex, int regex_le
new_entry.locale = pestrdup(locale, 1);
new_entry.tables = tables;
#endif
+ new_entry.refcount = 0;
/*
* Interned strings are not duplicated when stored in HashTable,
@@ -550,8 +552,10 @@ static void php_do_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global) /* {{{
*
RETURN_FALSE;
}
+ pce->refcount++;
php_pcre_match_impl(pce, subject, subject_len, return_value, subpats,
global, ZEND_NUM_ARGS() >= 4, flags, start_offset TSRMLS_CC);
+ pce->refcount--;
}
/* }}} */
@@ -988,14 +992,18 @@ PHPAPI char *php_pcre_replace(char *regex, int regex_len,
int *result_len, int limit, int *replace_count TSRMLS_DC)
{
pcre_cache_entry *pce; /* Compiled regular expression */
+ char *result; /* Function result */
/* Compile regex or get it from cache.. */
if ((pce = pcre_get_compiled_regex_cache(regex, regex_len TSRMLS_CC)) == NULL) {
return NULL;
}
-
- return php_pcre_replace_impl(pce, subject, subject_len, replace_val,
+ pce->refcount++;
+ result = php_pcre_replace_impl(pce, subject, subject_len, replace_val,
is_callable_replace, result_len, limit, replace_count TSRMLS_CC);
+ pce->refcount--;
+
+ return result;
}
/* }}} */
@@ -1476,7 +1484,9 @@ static PHP_FUNCTION(preg_split)
RETURN_FALSE;
}
+ pce->refcount++;
php_pcre_split_impl(pce, subject, subject_len, return_value, limit_val, flags TSRMLS_CC);
+ pce->refcount--;
}
/* }}} */
@@ -1756,8 +1766,10 @@ static PHP_FUNCTION(preg_grep)
if ((pce = pcre_get_compiled_regex_cache(regex, regex_len TSRMLS_CC)) == NULL) {
RETURN_FALSE;
}
-
+
+ pce->refcount++;
php_pcre_grep_impl(pce, input, return_value, flags TSRMLS_CC);
+ pce->refcount--;
}
/* }}} */
diff --git a/ext/pcre/tests/bug69864.phpt b/ext/pcre/tests/bug69864.phpt
new file mode 100644
index 0000000..d84862a
--- /dev/null
+++ b/ext/pcre/tests/bug69864.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Bug #69864 (Segfault in preg_replace_callback)
+--FILE--
+<?php
+const PREG_CACHE_SIZE = 4096; // this has to be >= the resp. constant in php_pcre.c
+
+var_dump(preg_replace_callback('/a/', function($m) {
+ for ($i = 0; $i < PREG_CACHE_SIZE; $i++) {
+ preg_match('/foo' . $i . 'bar/', '???foo' . $i .
'bar???');
+ }
+ return 'b';
+}, 'aa'));
+var_dump(preg_replace_callback('/a/', function($m) {
+ for ($i = 0; $i < PREG_CACHE_SIZE; $i++) {
+ preg_replace('/foo' . $i . 'bar/', 'baz', '???foo'
. $i . 'bar???');
+ }
+ return 'b';
+}, 'aa'));
+var_dump(preg_replace_callback('/a/', function($m) {
+ for ($i = 0; $i < PREG_CACHE_SIZE; $i++) {
+ preg_split('/foo' . $i . 'bar/', '???foo' . $i .
'bar???');
+ }
+ return 'b';
+}, 'aa'));
+var_dump(preg_replace_callback('/a/', function($m) {
+ for ($i = 0; $i < PREG_CACHE_SIZE; $i++) {
+ preg_grep('/foo' . $i . 'bar/', ['???foo' . $i .
'bar???']);
+ }
+ return 'b';
+}, 'aa'));
+?>
+--EXPECT--
+string(2) "bb"
+string(2) "bb"
+string(2) "bb"
+string(2) "bb"