com php-src: missed piece for renaming: Zend/zend_alloc.c

From: Date: Fri, 14 Oct 2016 00:08:28 +0000
Subject: com php-src: missed piece for renaming: Zend/zend_alloc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-95040@lists.php.net to get a copy of this message
Commit: d35d9d1d0e42c9717714540b075b67fc2d33ca0d Author: Anatol Belski <ab@php.net> Thu, 13 Oct 2016 15:39:02 +0200 Parents: dd604015bebc34396ad15c4f65a73f3f4cc326a9 Branches: PHP-7.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d35d9d1d0e42c9717714540b075b67fc2d33ca0d Log: missed piece for renaming (cherry picked from commit 5ba9eab4361cf9d0d9085f969acc2e96b8af3241) Changed paths: M Zend/zend_alloc.c Diff: diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 8dd77ff..f52ce79 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); }

« previous php.cvs (#95040) next »