From: Joe Watkins <krakjoe@php.net>
Date: Sat, 14 May 2016 07:20:41 +0000 (+0100)
Subject: fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)
X-Git-Tag: php-7.0.8RC1~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb951553be0175712f4b757e05004110d7421e04;p=php

fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)
---

diff --git a/NEWS b/NEWS
index d3cd2f5daf..d102d60792 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ PHP                                                                        NEWS
 - Intl
   . Fixed bug #64524 (Add intl.use_exceptions to php.ini-*). (Anatol)
 
+- PCRE
+  . Fixed bug #72143 (preg_replace uses int instead of size_t). (Joe)
+
 - PDO_pgsql:
   . Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound).
     (Laruence)
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index f6f86304e5..ed0f3b3ac4 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -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 */