diff options
| author | Adam Harvey <aharvey@php.net> | 2012-11-12 20:09:18 +0800 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2012-11-12 20:09:18 +0800 |
| commit | 0b96b4c4e9d4dc818713eee3159ff7c4ec6f5e9b (patch) | |
| tree | 9affc9cdeef2f496a2cc1c1d1d4dd95126b7acbd /ext/pcre/php_pcre.c | |
| parent | 180767373d03238431103c02a93de19df49c14dc (diff) | |
| parent | 6b9df7a4542c47fa6ab615461913ccdf7cdd4e10 (diff) | |
| download | php-git-0b96b4c4e9d4dc818713eee3159ff7c4ec6f5e9b.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Update arginfo for preg_match_all() to reflect reality.
fix invalid read when trimming empty string
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index ab33881f35..0c7280e3b8 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1870,7 +1870,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match, 0, 0, 2) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match_all, 0, 0, 3) +ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match_all, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, subject) ZEND_ARG_INFO(1, subpatterns) /* array */ |