]> granicus.if.org Git - php/commitdiff
Revert "fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)"
authorXinchen Hui <laruence@gmail.com>
Mon, 16 May 2016 03:24:16 +0000 (11:24 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 16 May 2016 03:24:16 +0000 (11:24 +0800)
ABI break

This reverts commit fb951553be0175712f4b757e05004110d7421e04.

ext/pcre/php_pcre.c

index ed0f3b3ac491b1bebbda9423d378e4c671b51297..f6f86304e5ec1143337e4f509741a9e191c17e11 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 */
-       size_t                   new_len;                       /* Length of needed storage */
-       size_t                   alloc_len;                     /* Actual allocated length */
+       int                              new_len;                       /* Length of needed storage */
+       int                              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 */