Fixed bug #73370

nikic · nikic · commit 177f87cf0521 · 2017-03-09T20:47:06.000+01:00
If len=0 malloc() is allowed to return NULL.
diff --git a/NEWS b/NEWS
@@ -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)
 
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -2862,7 +2862,7 @@ static ZEND_COLD ZEND_NORETURN void zend_out_of_memory(void)`
`2862`	`2862`	`ZEND_API void * __zend_malloc(size_t len)`
`2863`	`2863`	`{`
`2864`	`2864`	`void *tmp = malloc(len);`
`2865`		`- if (EXPECTED(tmp)) {`
	`2865`	`+ if (EXPECTED(tmp \|\| !len)) {`
`2866`	`2866`	`return tmp;`
`2867`	`2867`	`}`
`2868`	`2868`	`zend_out_of_memory();`
`@@ -2878,7 +2878,7 @@ ZEND_API void * __zend_calloc(size_t nmemb, size_t len)`
`2878`	`2878`	`ZEND_API void * __zend_realloc(void *p, size_t len)`
`2879`	`2879`	`{`
`2880`	`2880`	`p = realloc(p, len);`
`2881`		`- if (EXPECTED(p)) {`
	`2881`	`+ if (EXPECTED(p \|\| !len)) {`
`2882`	`2882`	`return p;`
`2883`	`2883`	`}`
`2884`	`2884`	`zend_out_of_memory();`