Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  #74337 pointer returned by php_stream_fopen_tmpfile not validated in memory.c

1 files changed, 6 insertions, 1 deletions

diff --git a/main/streams/memory.c b/main/streams/memory.c
index b1483e0786..39578dcffa 100644
--- a/main/streams/memory.c
+++ b/main/streams/memory.c
@@ -501,9 +501,14 @@ static int php_stream_temp_cast(php_stream *stream, int castas, void **ret)
 		return FAILURE;
 	}
 
+	file = php_stream_fopen_tmpfile();
+	if (file == NULL) {
+		php_error_docref(NULL, E_WARNING, "Unable to create temporary file.");
+		return FAILURE;
+	}
+
 	/* perform the conversion and then pass the request on to the innerstream */
 	membuf = php_stream_memory_get_buffer(ts->innerstream, &memsize);
-	file = php_stream_fopen_tmpfile();
 	php_stream_write(file, membuf, memsize);
 	pos = php_stream_tell(ts->innerstream);