com php-src: Conflicts: main/streams/memory.c: NEWS main/streams/memory.c
| From: | Xinchen Hui | Date: | Thu, 05 Feb 2015 08:32:30 +0000 |
| Subject: | com php-src: Conflicts: main/streams/memory.c: NEWS main/streams/memory.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84661@lists.php.net to get a copy of this message | ||
Commit: 5446377c6ba644da1b9092ba1957e948927851b3
Author: Nayana Hettiarachchi <nayana@ddproperty.com> Thu, 5 Feb 2015 12:26:29 +0800
Committer: Xinchen Hui <laruence@php.net> Thu, 5 Feb 2015 16:32:30 +0800
Parents: 959cecf046c16ac4d1a2afe2d37e3e89a36cb902
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5446377c6ba644da1b9092ba1957e948927851b3
Log:
Conflicts:
main/streams/memory.c
Changed paths:
M NEWS
M main/streams/memory.c
Diff:
diff --git a/NEWS b/NEWS
index 50f36ba..dd20fa9 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PHP NEWS
?? ??? 2015, PHP 5.5.22
- Core:
+ . Fixed bug #68986 (pointer returned by php_stream_fopen_temporary_file
+ not validated in memory.c). (nayana at ddproperty dot com)
. Fixed bug #67068 (getClosure returns somethings that's not a closure).
(Danack at basereality dot com)
.. Fixed bug #68925 (Mitigation for CVE-2015-0235 – GHOST: glibc gethostbyname
diff --git a/main/streams/memory.c b/main/streams/memory.c
index 0d00505..d0f2511 100644
--- a/main/streams/memory.c
+++ b/main/streams/memory.c
@@ -374,6 +374,10 @@ static size_t php_stream_temp_write(php_stream *stream, const char *buf, size_t
if (memsize + count >= ts->smax) {
php_stream *file = php_stream_fopen_tmpfile();
+ if (file == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create temporary file, Check
permissions in temporary files directory.");
+ return 0;
+ }
php_stream_write(file, membuf, memsize);
php_stream_free_enclosed(ts->innerstream, PHP_STREAM_FREE_CLOSE);
ts->innerstream = file;