diff options
| -rw-r--r-- | Zend/zend_multiply.h | 2 | ||||
| -rw-r--r-- | ext/pcre/php_pcre.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h index 0c23071a7f..8a93990466 100644 --- a/Zend/zend_multiply.h +++ b/Zend/zend_multiply.h @@ -266,7 +266,7 @@ static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, si } #endif -static zend_always_inline size_t safe_address(size_t nmemb, size_t size, size_t offset) +static zend_always_inline size_t zend_safe_address_guarded(size_t nmemb, size_t size, size_t offset) { int overflow; size_t ret = zend_safe_address(nmemb, size, offset, &overflow); 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 { |