mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #73370

Browse Source 
If len=0 malloc() is allowed to return NULL.
This commit is contained in:
Nikita Popov 2017-03-09 20:47:06 +01:00
parent 247ce052cd
commit 177f87cf05
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -2,6 +2,10 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2017 PHP 7.0.18
- Core:
. Fixed bug #73370 (falsely exits with "Out of Memory" when using
USE_ZEND_ALLOC=0). (Nikita)
- Date:
. Fixed bug #72096 (Swatch time value incorrect for dates before 1970). (mcq8)

4
Zend/zend_alloc.c
View File

@ -2862,7 +2862,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();
@ -2878,7 +2878,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();