com php-src: Fixed IS_REFERENCE handling in preg_matc h: ext/pcre/php_pcre.c
| From: | Dmitry Stogov | Date: | Thu, 06 Mar 2014 15:39:34 +0000 |
| Subject: | com php-src: Fixed IS_REFERENCE handling in preg_matc h: ext/pcre/php_pcre.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77695@lists.php.net to get a copy of this message | ||
Commit: 10c7f2ddbc98dec21e3060fc4c9319465438c9a9
Author: Xinchen Hui <laruence@gmail.com> Thu, 6 Mar 2014 23:39:34 +0800
Parents: 2d45dce4aa3e00f5d0bf40cc19d81033c3ce08bc
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=10c7f2ddbc98dec21e3060fc4c9319465438c9a9
Log:
Fixed IS_REFERENCE handling in preg_match
Changed paths:
M ext/pcre/php_pcre.c
Diff:
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 0a62f6f..83844b1 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -539,6 +539,9 @@ static void php_do_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global) /* {{{ *
RETURN_FALSE;
}
+ if (subpats) {
+ subpats = Z_REFVAL_P(subpats);
+ }
php_pcre_match_impl(pce, subject, subject_len, return_value, subpats,
global, ZEND_NUM_ARGS() >= 4, flags, start_offset TSRMLS_CC);
}