cvs: php-src(PHP_4_3) / NEWS /ext/pcre php_pcre.c

iliaa Wed Jan 28 16:49:16 2004 EDT Modified files: (Branch: PHP_4_3) /php-src NEWS /php-src/ext/pcre php_pcre.c Log: MFH: Fixed bug #27011 (64bit int/long confusion in preg_match*() functions) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.546&r2=1.1247.2.547&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.546 php-src/NEWS:1.1247.2.547 --- php-src/NEWS:1.1247.2.546 Wed Jan 28 14:26:44 2004 +++ php-src/NEWS Wed Jan 28 16:49:14 2004 @@ -12,6 +12,8 @@ (Ilia) - Fixed bug #27040 (passing an array of form-fields to CURLOPT_POSTFIELDS does not work). (Ilia, Jani) +- Fixed bug #27011 (64bit int/long confusion in preg_match*() functions). + (Ilia) - Fixed bug #26974 (rename() doesn't check the destination file against safe_mode/open_basedir). (Ilia) - Fixed bug #26973 (*printf() '+' modifier broken). (Jani) http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.132.2.14&r2=1.132.2.15&ty=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.132.2.14 php-src/ext/pcre/php_pcre.c:1.132.2.15 --- php-src/ext/pcre/php_pcre.c:1.132.2.14 Thu Jan 15 21:31:26 2004 +++ php-src/ext/pcre/php_pcre.c Wed Jan 28 16:49:15 2004 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.132.2.14 2004/01/16 02:31:26 iliaa Exp $ */ +/* $Id: php_pcre.c,v 1.132.2.15 2004/01/28 21:49:15 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -347,7 +347,7 @@ int regex_len; int subject_len; zval *subpats = NULL; /* Array for subpatterns */ - int flags; /* Match control flags */ + long flags; /* Match control flags */ zval *result_set, /* Holds a set of subpatterns after a global match */ @@ -361,7 +361,7 @@ int *offsets; /* Array of subpattern offsets */ int num_subpats; /* Number of captured subpatterns */ int size_offsets; /* Size of the offsets array */ - int start_offset = 0; /* Where the new search starts */ + long start_offset = 0; /* Where the new search starts */ int matched; /* Has anything matched */ int subpats_order = 0; /* Order of subpattern matches */ int offset_capture = 0;/* Capture match offsets: yes/no */