[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/pcre php_pcre.c

[Jani Taskinen]

sniper          Thu Sep 11 21:32:39 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src    NEWS 
    /php-src/ext/pcre   php_pcre.c 
  Log:
  MFH: - Fixed bug #25504 (pcre_match_all() crashes when passed only 2 parameters)
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.393 php-src/NEWS:1.1247.2.394
--- php-src/NEWS:1.1247.2.393   Thu Sep 11 19:51:27 2003
+++ php-src/NEWS        Thu Sep 11 21:32:37 2003
@@ -7,6 +7,8 @@
 - Fixed crash bug when non-existing save/serializer handler was used. (Jani)
 - Fixed memory leak in gethostbynamel() if an error occurs. (Sara)
 - Fixed FastCGI being unable to bind to a specific IP. (Sascha)
+- Fixed bug #25504 (pcre_match_all() crashes when passed only 2 parameters).
+  (Jani)
 - Fixed bug #25494 (array_merge*() allows non-arrays as argument). (Jay)
 - Fixed bug #23488 (zlib.output_compression overrides Vary header). (Stefan)
 - Fixed bug #25483 (ext/informix: bogus -469 error from ifx_query()). 
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.132.2.9 php-src/ext/pcre/php_pcre.c:1.132.2.10
--- php-src/ext/pcre/php_pcre.c:1.132.2.9       Thu Aug 28 13:16:01 2003
+++ php-src/ext/pcre/php_pcre.c Thu Sep 11 21:32:38 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_pcre.c,v 1.132.2.9 2003/08/28 17:16:01 sas Exp $ */
+/* $Id: php_pcre.c,v 1.132.2.10 2003/09/12 01:32:38 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -372,7 +372,7 @@
        char               **subpat_names = NULL;/* Array for named subpatterns */
        int                              i;
        
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|zll", &regex, 
&regex_len,
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ((global) ? "ssz|ll" : 
"ss|zll"), &regex, &regex_len,
                                                          &subject, &subject_len, 
&subpats, &flags, &start_offset) == FAILURE) {
                RETURN_FALSE;
        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php