From: Anatol Belski Date: Thu, 13 Oct 2016 13:39:02 +0000 (+0200) Subject: missed piece for renaming X-Git-Tag: php-7.1.0RC4~21^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ba9eab4361cf9d0d9085f969acc2e96b8af3241;p=php missed piece for renaming --- diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 77471e5eb8..40eb10046f 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2502,22 +2502,22 @@ ZEND_API size_t ZEND_FASTCALL _zend_mem_block_size(void *ptr ZEND_FILE_LINE_DC Z ZEND_API void* ZEND_FASTCALL _safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) { - return emalloc_rel(safe_address(nmemb, size, offset)); + return emalloc_rel(zend_safe_address_guarded(nmemb, size, offset)); } ZEND_API void* ZEND_FASTCALL _safe_malloc(size_t nmemb, size_t size, size_t offset) { - return pemalloc(safe_address(nmemb, size, offset), 1); + return pemalloc(zend_safe_address_guarded(nmemb, size, offset), 1); } ZEND_API void* ZEND_FASTCALL _safe_erealloc(void *ptr, size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) { - return erealloc_rel(ptr, safe_address(nmemb, size, offset)); + return erealloc_rel(ptr, zend_safe_address_guarded(nmemb, size, offset)); } ZEND_API void* ZEND_FASTCALL _safe_realloc(void *ptr, size_t nmemb, size_t size, size_t offset) { - return perealloc(ptr, safe_address(nmemb, size, offset), 1); + return perealloc(ptr, zend_safe_address_guarded(nmemb, size, offset), 1); }