diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-05-16 11:24:16 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-05-16 11:24:16 +0800 |
| commit | 9e7afa75140afd047cb95280a610cff9368a7517 (patch) | |
| tree | df51735d94000a9e964e3156fd692bf914cf57c9 /ext/pcre/php_pcre.c | |
| parent | 1559fd7e48837b8f91de15e912865baab57bcdb5 (diff) | |
| download | php-git-9e7afa75140afd047cb95280a610cff9368a7517.tar.gz | |
Revert "fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)"
ABI break
This reverts commit fb951553be0175712f4b757e05004110d7421e04.
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index ed0f3b3ac4..f6f86304e5 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 */ - 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 */ |