MFH: Fixed bug #27011 (64bit int/long confusion in preg_match*() functions)

diff --git a/NEWS b/NEWS
index 4e98632e947617cb3c486f631f9c17cec2bb49a3..8f5887c67291aef69ebd6a87127cea6ee2bee2f1 100644 (file)
--- 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 f72beee58304a381f978f035ca2ea9e7a0d12dbf..402eef476b764a2a287a9a356d488cbfe73b565d 100644 (file)
--- 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 */