diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-03-09 20:48:32 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-03-09 20:48:32 +0100 |
| commit | 8a34b33c599aca1bf73cef41aca90fea11787330 (patch) | |
| tree | 504be6d4e278f8d008dece02072a119870443e0d /Zend/zend_alloc.c | |
| parent | 30be110c5a76589036e5abab8b4e5f4f28b2cba7 (diff) | |
| parent | 305f3c2b7602f84854154a9d878ec5174d5e88ec (diff) | |
| download | php-git-8a34b33c599aca1bf73cef41aca90fea11787330.tar.gz | |
Merge branch '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 3fb8bff551..379715674f 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(); |