diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-03-09 20:48:14 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-03-09 20:48:24 +0100 |
| commit | 305f3c2b7602f84854154a9d878ec5174d5e88ec (patch) | |
| tree | ae5eb15579b1f12b2f51d3a7288a5fa8f86b0c8b /Zend/zend_alloc.c | |
| parent | 314ef0ff69f2b88c3eaa8c9abd7610e09fa50d89 (diff) | |
| parent | 177f87cf052179d22bab008aa13c69d4b0cdc0ef (diff) | |
| download | php-git-305f3c2b7602f84854154a9d878ec5174d5e88ec.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index a25972045d..b829bd3dba 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2818,7 +2818,7 @@ static ZEND_COLD ZEND_NORETURN void zend_out_of_memory(void) ZEND_API void * __zend_malloc(size_t len) { void *tmp = malloc(len); - if (EXPECTED(tmp)) { + if (EXPECTED(tmp || !len)) { return tmp; } zend_out_of_memory(); @@ -2834,7 +2834,7 @@ ZEND_API void * __zend_calloc(size_t nmemb, size_t len) ZEND_API void * __zend_realloc(void *p, size_t len) { p = realloc(p, len); - if (EXPECTED(p)) { + if (EXPECTED(p || !len)) { return p; } zend_out_of_memory(); |