Permalink
Browse files

Merge branch 'PHP-5.4'

* PHP-5.4:
  Update arginfo for preg_match_all() to reflect reality.
  fix invalid read when trimming empty string
  • Loading branch information...
2 parents 1807673 + 6b9df7a commit 0b96b4c4e9d4dc818713eee3159ff7c4ec6f5e9b @LawnGnome LawnGnome committed Nov 12, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 ext/pcre/php_pcre.c
View
@@ -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 */

0 comments on commit 0b96b4c

Please sign in to comment.