diff options
| -rw-r--r-- | ext/pcre/php_pcre.c | 5 | ||||
| -rw-r--r-- | ext/pcre/tests/006.phpt | 22 |
2 files changed, 26 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 9a5b7a7bca..e48a97e043 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1220,8 +1220,11 @@ static char *php_replace_in_subject(zval *regex, zval *replace, zval **subject, efree(subject_value); subject_value = result; subject_len = *result_len; + } else { + efree(subject_value); + return NULL; } - + zend_hash_move_forward(Z_ARRVAL_P(regex)); } diff --git a/ext/pcre/tests/006.phpt b/ext/pcre/tests/006.phpt new file mode 100644 index 0000000000..d1282bf426 --- /dev/null +++ b/ext/pcre/tests/006.phpt @@ -0,0 +1,22 @@ +--TEST-- +preg_replace() with array of failing regular expressions +--FILE-- +<?php + +$text = '[CODE]<td align="$stylevar[right]">[/CODE]'; +$result = preg_replace(array('#\[(right)\](((?R)|[^[]+?|\[)*)\[/\\1\]#siU', '#\[(right)\](((?R)|[^[]+?|\[)*)\[/\\1\]#siU'), '', $text); +var_dump($text); +var_dump($result); + +$result = preg_replace('#\[(right)\](((?R)|[^[]+?|\[)*)\[/\\1\]#siU', '', $text); +var_dump($text); +var_dump($result); + +echo "Done\n"; +?> +--EXPECTF-- +string(58) "[CODE]<td align="$stylevar[right]">[/CODE]" +NULL +string(58) "[CODE]<td align="$stylevar[right]">[/CODE]" +NULL +Done |