From d35d9d1d0e42c9717714540b075b67fc2d33ca0d Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 13 Oct 2016 15:39:02 +0200 Subject: [PATCH] missed piece for renaming (cherry picked from commit 5ba9eab4361cf9d0d9085f969acc2e96b8af3241) --- Zend/zend_alloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 8dd77ff67b..f52ce7985e 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2458,22 +2458,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); } -- 2.50.1