summaryrefslogtreecommitdiff
path: root/main/streams/streams.c
diff options
context:
space:
mode:
authorArnaud Le Blanc <lbarnaud@php.net>2008-11-11 01:55:51 +0000
committerArnaud Le Blanc <lbarnaud@php.net>2008-11-11 01:55:51 +0000
commite13a4238e5ea960093b29f74dd7367d3970324ee (patch)
tree3cba490d9b561fa34cc09124df000f04a199b4fe /main/streams/streams.c
parentf6345133b39a3c951ef267985dfe3c5f20cff2c5 (diff)
downloadphp-git-e13a4238e5ea960093b29f74dd7367d3970324ee.tar.gz
MFH: Fixed stream_get_contents() when using $maxlength and socket is not
closed. indeyets@php.net on #46049.
Diffstat (limited to 'main/streams/streams.c')
-rwxr-xr-xmain/streams/streams.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 530a8d8e14..a2c956c3af 100755
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -1243,7 +1243,7 @@ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen
if (maxlen > 0) {
ptr = *buf = pemalloc_rel_orig(maxlen + 1, persistent);
- while ((len < maxlen) & !php_stream_eof(src)) {
+ while ((len < maxlen) && !php_stream_eof(src)) {
ret = php_stream_read(src, ptr, maxlen - len);
len += ret;
ptr += ret;