summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-10-13 15:39:02 +0200
committerAnatol Belski <ab@php.net>2016-10-13 15:41:36 +0200
commit140e2adb5ab8a5ed0624366c0416f07b8aa17254 (patch)
tree09e7e0da7e9d661dfafd3442042d70187719d811
parentd23ee8bf76e5031ddf0a8299ea6a96cee0a10d89 (diff)
downloadphp-git-PHP-7.0.12.tar.gz
missed piece for renamingphp-7.0.12PHP-7.0.12
(cherry picked from commit 5ba9eab4361cf9d0d9085f969acc2e96b8af3241)
-rw-r--r--Zend/zend_alloc.c8
1 files changed, 4 insertions, 4 deletions
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);
}