com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS main/streams/memory.c

From: Date: Thu, 05 Feb 2015 08:33:20 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS main/streams/memory.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-84660@lists.php.net to get a copy of this message
Commit: ae900108916885db03a047d5e5b14eddbac63d13 Author: Xinchen Hui <laruence@php.net> Thu, 5 Feb 2015 16:33:20 +0800 Parents: a79f332333f9a9203764c4698e7e253eb38a8bdd 5446377c6ba644da1b9092ba1957e948927851b3 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ae900108916885db03a047d5e5b14eddbac63d13 Log: Merge branch 'PHP-5.5' into PHP-5.6 Conflicts: main/streams/memory.c Changed paths: MM NEWS MM main/streams/memory.c Diff: diff --cc NEWS index 5c94e12,dd20fa9..063e752 --- a/NEWS +++ b/NEWS @@@ -1,13 -1,14 +1,15 @@@ -PHP NEWS +PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2015, PHP 5.5.23 +?? Feb 2015, PHP 5.6.7 -?? ??? 2015, PHP 5.5.22 + +?? Feb 2015, PHP 5.6.6 - 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). + . 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 buffer overflow). (Stas) diff --cc main/streams/memory.c index 1577ae5,d0f2511...e5b6572 --- a/main/streams/memory.c +++ b/main/streams/memory.c @@@ -374,7 -373,11 +374,11 @@@ static size_t php_stream_temp_write(php char *membuf = php_stream_memory_get_buffer(ts->innerstream, &memsize); if (memsize + count >= ts->smax) { - php_stream *file = php_stream_fopen_tmpfile(); + php_stream *file = php_stream_fopen_temporary_file(ts->tmpdir, "php", NULL); + 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;

« previous php.cvs (#84660) next »