cvs: php-src /ext/pcre php_pcre.c
| From: | Jani Taskinen | Date: | Fri, 12 Sep 2003 01:31:56 +0000 |
| Subject: | cvs: php-src /ext/pcre php_pcre.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-23750@lists.php.net to get a copy of this message | ||
sniper Thu Sep 11 21:31:56 2003 EDT
Modified files:
/php-src/ext/pcre php_pcre.c
Log:
- Fixed bug #25504 (pcre_match_all() crashes when passed only 2 parameters)
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.145 php-src/ext/pcre/php_pcre.c:1.146
--- php-src/ext/pcre/php_pcre.c:1.145 Sun Aug 31 08:41:46 2003
+++ php-src/ext/pcre/php_pcre.c Thu Sep 11 21:31:54 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.145 2003/08/31 12:41:46 zeev Exp $ */
+/* $Id: php_pcre.c,v 1.146 2003/09/12 01:31:54 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -371,7 +371,7 @@
char **subpat_names = NULL;/* Array for named subpatterns */
int i;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|zll", ®ex,
®ex_len,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ((global) ? "ssz|ll" :
"ss|zll"), ®ex, ®ex_len,
&subject, &subject_len, &subpats, &flags, &start_offset) == FAILURE) {
RETURN_FALSE;
}