diff options
| author | Nikita Popov <nikic@php.net> | 2016-08-03 00:35:00 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-08-03 00:35:00 +0200 |
| commit | 41e93041f84705d70f8233a42a1233e96d18d54b (patch) | |
| tree | 54ce6f070dc080975741a5f79eeda852e166a9ff /main | |
| parent | 3d0002ed369602c4eb8c37ee69b1eb947fd9fa56 (diff) | |
| parent | 1bcd439cad5eefeef1fecbc9076b72ef76fb80b6 (diff) | |
| download | php-git-41e93041f84705d70f8233a42a1233e96d18d54b.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'main')
| -rw-r--r-- | main/rfc1867.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/rfc1867.c b/main/rfc1867.c index 7543868605..6aa6b5d626 100644 --- 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; |