]> granicus.if.org Git - php/commitdiff
missed piece for renaming
authorAnatol Belski <ab@php.net>
Thu, 13 Oct 2016 13:39:02 +0000 (15:39 +0200)
committerAnatol Belski <ab@php.net>
Fri, 14 Oct 2016 00:08:28 +0000 (02:08 +0200)
(cherry picked from commit 5ba9eab4361cf9d0d9085f969acc2e96b8af3241)

Zend/zend_alloc.c

index 8dd77ff67bfcc353543a6f7b0c5275d84f424f7b..f52ce7985ebe9bacda5f45428c0c7ae71c513b80 100644 (file)
@@ -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);
 }