diff options
| author | Anatol Belski <ab@php.net> | 2016-10-13 15:23:15 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-10-13 15:23:50 +0200 |
| commit | 730288ae41fe0d40d00b27174b558cf260b1a7df (patch) | |
| tree | 5c712e11dfc37978212802addbf2ebf576423ac9 /ext/pcre/php_pcre.c | |
| parent | d14498a475642642cfeee21630058941c33a6dfb (diff) | |
| download | php-git-730288ae41fe0d40d00b27174b558cf260b1a7df.tar.gz | |
rename publicly exposed symbol to avoid name conflicts
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 9b1fb20aaa..31c97cf975 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1248,7 +1248,7 @@ PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, zend_string *su } if (new_len >= alloc_len) { - alloc_len = safe_address(2, new_len, alloc_len); + alloc_len = zend_safe_address_guarded(2, new_len, alloc_len); if (result == NULL) { result = zend_string_alloc(alloc_len, 0); } else { @@ -1291,9 +1291,9 @@ PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, zend_string *su /* Use custom function to get replacement string and its length. */ eval_result = preg_do_repl_func(replace_val, subject, offsets, subpat_names, count, mark); ZEND_ASSERT(eval_result); - new_len = safe_address(1, ZSTR_LEN(eval_result), new_len); + new_len = zend_safe_address_guarded(1, ZSTR_LEN(eval_result), new_len); if (new_len >= alloc_len) { - alloc_len = safe_address(2, new_len, alloc_len); + alloc_len = zend_safe_address_guarded(2, new_len, alloc_len); if (result == NULL) { result = zend_string_alloc(alloc_len, 0); } else { |