cvs: php-src(PHP_5_2) / NEWS /main/streams streams.c

iliaa Wed Aug 8 02:16:41 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/main/streams streams.c /php-src NEWS Log: Fixed bug #42237 (stream_copy_to_stream returns invalid values for mmaped streams). http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.16&r2=1.82.2.6.2.17&diff_format=u Index: php-src/main/streams/streams.c diff -u php-src/main/streams/streams.c:1.82.2.6.2.16 php-src/main/streams/streams.c:1.82.2.6.2.17 --- php-src/main/streams/streams.c:1.82.2.6.2.16 Wed Jul 11 14:33:30 2007 +++ php-src/main/streams/streams.c Wed Aug 8 02:16:41 2007 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.82.2.6.2.16 2007/07/11 14:33:30 dmitry Exp $ */ +/* $Id: streams.c,v 1.82.2.6.2.17 2007/08/08 02:16:41 iliaa Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -1313,11 +1313,11 @@ p = php_stream_mmap_range(src, php_stream_tell(src), maxlen, PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped); if (p) { - haveread = php_stream_write(dest, p, mapped); + size_t written = php_stream_write(dest, p, mapped); php_stream_mmap_unmap(src); - return mapped; + return written; } } http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.882&r2=1.2027.2.547.2.883&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.882 php-src/NEWS:1.2027.2.547.2.883 --- php-src/NEWS:1.2027.2.547.2.882 Mon Aug 6 19:40:21 2007 +++ php-src/NEWS Wed Aug 8 02:16:41 2007 @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Aug 2007, PHP 5.2.4 +- Fixed bug #42237 (stream_copy_to_stream returns invalid values for mmaped + streams). (andrew dot minerd at sellingsource dot com, Ilia) - Fixed bug #42222 (possible buffer overflow in php_openssl_make_REQ). (Pierre) - Fixed bug #42208 (substr_replace() crashes when the same array is passed more than once). (crrodriguez at suse dot de, Ilia)