From: Ilia Alshanetsky Date: Wed, 28 Jan 2004 21:49:15 +0000 (+0000) Subject: MFH: Fixed bug #27011 (64bit int/long confusion in preg_match*() functions) X-Git-Tag: php-4.3.5RC2~14 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33d0cdb426d1e0e7296f5232a61774bb7f968529;p=php MFH: Fixed bug #27011 (64bit int/long confusion in preg_match*() functions) --- diff --git a/NEWS b/NEWS index 4e98632e94..8f5887c672 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,8 @@ PHP 4 NEWS (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) diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index f72beee583..402eef476b 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -347,7 +347,7 @@ static void php_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global) 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 @@ static void php_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global) 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 */