]> granicus.if.org Git - php/commitdiff
Revert "Revert "fix #72143 (preg_replace uses int instead of size_t on zend_string_al...
authorXinchen Hui <laruence@gmail.com>
Mon, 16 May 2016 13:21:11 +0000 (06:21 -0700)
committerXinchen Hui <laruence@gmail.com>
Mon, 16 May 2016 13:22:13 +0000 (06:22 -0700)
obviously I read the change is in argument lists by mistake :<

This reverts commit 9e7afa75140afd047cb95280a610cff9368a7517.

ext/pcre/php_pcre.c

index f6f86304e5ec1143337e4f509741a9e191c17e11..ed0f3b3ac491b1bebbda9423d378e4c671b51297 100644 (file)
@@ -1119,8 +1119,8 @@ PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, zend_string *su
        char                    **subpat_names;         /* Array for named subpatterns */
        int                              num_subpats;           /* Number of captured subpatterns */
        int                              size_offsets;          /* Size of the offsets array */
-       int                              new_len;                       /* Length of needed storage */
-       int                              alloc_len;                     /* Actual allocated length */
+       size_t                   new_len;                       /* Length of needed storage */
+       size_t                   alloc_len;                     /* Actual allocated length */
        int                              match_len;                     /* Length of the current match */
        int                              backref;                       /* Backreference number */
        int                              start_offset;          /* Where the new search starts */