Fix bug #72724

diff --git a/NEWS b/NEWS
index 27bd7b02759c3d41abfe7bcfeb5899787dcb599a..af59ed178142b9d6bfb64fb856419677c1953855 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ PHP                                                                        NEWS
 - GD:
   . Fixed bug #72709 (imagesetstyle() causes OOB read for empty $styles). (cmb)
 
+- Session:
+  . Fixed bug #72724 (PHP7: session-uploadprogress kills httpd). (Nikita)
+
 
 ?? ??? 2016 PHP 7.0.10
 

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 14e72d91f58dc4de1393c09db87c209eebe573bd..afd982cca84701438e267433164c435ecd11c135 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -1099,7 +1099,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
                                multipart_event_file_end event_file_end;
 
                                event_file_end.post_bytes_processed = SG(read_post_bytes);
-                               event_file_end.temp_filename = ZSTR_VAL(temp_filename);
+                               event_file_end.temp_filename = temp_filename ? ZSTR_VAL(temp_filename) : NULL;
                                event_file_end.cancel_upload = cancel_upload;
                                if (php_rfc1867_callback(MULTIPART_EVENT_FILE_END, &event_file_end, &event_extra_data) == FAILURE) {
                                        cancel_upload = UPLOAD_ERROR_X;