summaryrefslogtreecommitdiff
path: root/main/streams/streams.c
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2007-08-08 02:16:41 +0000
committerIlia Alshanetsky <iliaa@php.net>2007-08-08 02:16:41 +0000
commit0cb6dd56710d4bc4bd63548232e1768d6f9a20d6 (patch)
tree45ca8934b71f1fae3db69da2acf92d2cabe7345c /main/streams/streams.c
parentaa02056fcb1726fd254e600931fc0059df05e6d8 (diff)
downloadphp-git-0cb6dd56710d4bc4bd63548232e1768d6f9a20d6.tar.gz
Fixed bug #42237 (stream_copy_to_stream returns invalid values for mmaped
streams).
Diffstat (limited to 'main/streams/streams.c')
-rwxr-xr-xmain/streams/streams.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 09b497c3a4..894bd689eb 100755
--- 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;
}
}