Fixed bug #42237 (stream_copy_to_stream returns invalid values for mmaped

streams).

diff --git a/NEWS b/NEWS
index b98e8d0392f650340ea52b36fc3163b6782c3390..3172d8992bda70528afa50e4c086b155b6baaa94 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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)

diff --git a/main/streams/streams.c b/main/streams/streams.c
index 09b497c3a4a19fd5c7d9af8702acffdfbaac5dc8..894bd689eb336a9e516b93f99943fc20c1dcec03 100755 (executable)
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -1313,11 +1313,11 @@ PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size
                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;
                }
        }