Merge branch 'PHP-7.0' into PHP-7.1

nikic · nikic · commit 305f3c2b7602 · 2017-03-09T20:48:24.000+01:00
diff --git a/NEWS b/NEWS
@@ -4,6 +4,8 @@ PHP                                                                        NEWS
 
 - Core:
   . Fixed bug #74149 (static embed SAPI linkage error). (krakjoe)
+  . 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
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -2818,7 +2818,7 @@ static ZEND_COLD ZEND_NORETURN void zend_out_of_memory(void)`
`2818`	`2818`	`ZEND_API void * __zend_malloc(size_t len)`
`2819`	`2819`	`{`
`2820`	`2820`	`void *tmp = malloc(len);`
`2821`		`- if (EXPECTED(tmp)) {`
	`2821`	`+ if (EXPECTED(tmp \|\| !len)) {`
`2822`	`2822`	`return tmp;`
`2823`	`2823`	`}`
`2824`	`2824`	`zend_out_of_memory();`
`@@ -2834,7 +2834,7 @@ ZEND_API void * __zend_calloc(size_t nmemb, size_t len)`
`2834`	`2834`	`ZEND_API void * __zend_realloc(void *p, size_t len)`
`2835`	`2835`	`{`
`2836`	`2836`	`p = realloc(p, len);`
`2837`		`- if (EXPECTED(p)) {`
	`2837`	`+ if (EXPECTED(p \|\| !len)) {`
`2838`	`2838`	`return p;`
`2839`	`2839`	`}`
`2840`	`2840`	`zend_out_of_memory();`