From: Arnaud Le Blanc <lbarnaud@php.net>
Date: Tue, 11 Nov 2008 01:55:19 +0000 (+0000)
Subject: Fixed stream_get_contents() when using $maxlength and socket is not
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc938b54c779985fb55de830c6faaf932c90797c;p=php

Fixed stream_get_contents() when using $maxlength and socket is not
closed. indeyets@php.net on #46049.
---

diff --git a/ext/standard/tests/streams/stream_get_contents_002.phpt b/ext/standard/tests/streams/stream_get_contents_002.phpt
new file mode 100644
index 0000000000..66ff3fb189
--- /dev/null
+++ b/ext/standard/tests/streams/stream_get_contents_002.phpt
@@ -0,0 +1,18 @@
+--TEST--
+stream_get_contents() - Testing on socket with $maxlength
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') die("skip: non windows test");
+?>
+--FILE--
+<?php
+$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
+
+stream_set_timeout($sockets[1], 6000);
+
+fwrite($sockets[0], b"foo");
+var_dump(stream_get_contents($sockets[1], 3));
+
+?>
+--EXPECT--
+string(3) "foo"
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 6f9a4eef1b..ba2f65c5d3 100755
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -1672,7 +1672,7 @@ PHPAPI size_t _php_stream_copy_to_mem_ex(php_stream *src, zend_uchar rettype, vo
 	if (maxlen > 0) {
 		if (rettype == IS_UNICODE) {
 			ptr.u = *buf = pemalloc_rel_orig(UBYTES(maxlen + 1), persistent);
-			while ((len < maxlen) & !php_stream_eof(src)) {
+			while ((len < maxlen) && !php_stream_eof(src)) {
 				int ulen;
 
 				ret = php_stream_read_unicode_ex(src, ptr.u, maxlen - len, maxchars);
@@ -1685,7 +1685,7 @@ PHPAPI size_t _php_stream_copy_to_mem_ex(php_stream *src, zend_uchar rettype, vo
 			return len;
 		} else {
 			ptr.s = *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.s, maxlen - len);
 				len += ret;
 				ptr.s += ret;