Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string

weltling · weltling · commit 89a5bd675005 · 2017-02-15T11:22:47.000+01:00
diff --git a/ext/standard/tests/streams/bug74090.phpt b/ext/standard/tests/streams/bug74090.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #74090 stream_get_contents maxlength>-1 returns empty string on windows
+--SKIPIF--
+<?php
+if (getenv("SKIP_ONLINE_TESTS")) { die('skip: online test'); }
+if (getenv("SKIP_SLOW_TESTS")) { die('skip: slow test'); }
+?>
+--FILE--
+<?php
+$data = base64_decode("1oIBAAABAAAAAAAAB2V4YW1wbGUDb3JnAAABAAE=");
+$fd = stream_socket_client("udp://8.8.8.8:53", $errno, $errstr, 0, STREAM_CLIENT_CONNECT | STREAM_CLIENT_ASYNC_CONNECT);
+stream_set_blocking($fd, 0);
+stream_socket_sendto($fd,$data);
+sleep(1);
+$ret = stream_get_contents($fd,65565);
+var_dump(strlen($ret) > 0);
+stream_socket_shutdown($fd,STREAM_SHUT_RDWR);
+?>
+==DONE==
+--EXPECTF--
+bool(true)
+==DONE==
diff --git a/main/streams/php_streams_int.h b/main/streams/php_streams_int.h
@@ -53,6 +53,10 @@
 #  undef EWOULDBLOCK
 # endif
 # define EWOULDBLOCK WSAEWOULDBLOCK
+# ifdef EMSGSIZE
+#  undef EMSGSIZE
+# endif
+# define EMSGSIZE WSAEMSGSIZE
 #endif
 
 /* This functions transforms the first char to 'w' if it's not 'r', 'a' or 'w'
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
@@ -336,7 +336,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void
 					ret = recv(sock->socket, &buf, sizeof(buf), MSG_PEEK);
 					err = php_socket_errno();
 					if (0 == ret || /* the counterpart did properly shutdown*/
-						(0 > ret && err != EWOULDBLOCK && err != EAGAIN)) { /* there was an unrecoverable error */
+						(0 > ret && err != EWOULDBLOCK && err != EAGAIN && err != EMSGSIZE)) { /* there was an unrecoverable error */
 						alive = 0;
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void`
`336`	`336`	`ret = recv(sock->socket, &buf, sizeof(buf), MSG_PEEK);`
`337`	`337`	`err = php_socket_errno();`
`338`	`338`	`if (0 == ret \|\| /* the counterpart did properly shutdown*/`
`339`		`- (0 > ret && err != EWOULDBLOCK && err != EAGAIN)) { /* there was an unrecoverable error */`
	`339`	`+ (0 > ret && err != EWOULDBLOCK && err != EAGAIN && err != EMSGSIZE)) { /* there was an unrecoverable error */`
`340`	`340`	`alive = 0;`
`341`	`341`	`}`
`342`	`342`	`}`