com php-src: missed piece for renaming: Zend/zend_alloc.c
| From: | Anatol Belski | Date: | Thu, 13 Oct 2016 13:41:36 +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-95032@lists.php.net to get a copy of this message | ||
Commit: 140e2adb5ab8a5ed0624366c0416f07b8aa17254
Author: Anatol Belski <ab@php.net> Thu, 13 Oct 2016 15:39:02 +0200
Parents: d23ee8bf76e5031ddf0a8299ea6a96cee0a10d89
Branches: PHP-7.0.12
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=140e2adb5ab8a5ed0624366c0416f07b8aa17254
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 77471e5..40eb100 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);
}