Fix socket_export_stream() with wrong proto

Author: twose

ext/sockets/sockets.c

@@ -2252,7 +2252,6 @@ PHP_FUNCTION(socket_export_stream)
 	php_stream *stream = NULL;
 	php_netstream_data_t *stream_data;
 	char *protocol = NULL;
-	size_t protocollen = 0;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &zsocket, socket_ce) == FAILURE) {
 		RETURN_THROWS();
@@ -2287,12 +2286,10 @@ PHP_FUNCTION(socket_export_stream)
 			if (protoid == IPPROTO_TCP)
 #endif
 			{
-				protocol = "tcp";
-				protocollen = 3;
+				protocol = "tcp://";
 			}
 		} else if (protoid == SOCK_DGRAM) {
-			protocol = "udp";
-			protocollen = 3;
+			protocol = "udp://";
 		}
 #ifdef PF_UNIX
 	} else if (socket->type == PF_UNIX) {
@@ -2302,11 +2299,9 @@ PHP_FUNCTION(socket_export_stream)
 		getsockopt(socket->bsd_socket, SOL_SOCKET, SO_TYPE, (char *) &type, &typelen);
 
 		if (type == SOCK_STREAM) {
-			protocol = "unix";
-			protocollen = 4;
+			protocol = "unix://";
 		} else if (type == SOCK_DGRAM) {
-			protocol = "udg";
-			protocollen = 3;
+			protocol = "udg://";
 		}
 #endif
 	}
@@ -2315,7 +2310,7 @@ PHP_FUNCTION(socket_export_stream)
 	 * We don't want streams to actually *do* anything though, so don't give it
 	 * anything apart from the protocol */
 	if (protocol != NULL) {
-		stream = php_stream_xport_create(protocol, protocollen, 0, 0, NULL, NULL, NULL, NULL, NULL);
+		stream = php_stream_xport_create(protocol, strlen(protocol), 0, 0, NULL, NULL, NULL, NULL, NULL);
 	}
 
 	/* Fall back to creating a generic socket stream */

ext/sockets/tests/bug-export-proto.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Bug - socket_export_stream() with wrong proto
+--EXTENSIONS--
+sockets
+--FILE--
+<?php
+$sock = socket_create(AF_INET, SOCK_DGRAM, 0);
+$stream = socket_export_stream($sock);
+echo stream_get_meta_data($stream)['stream_type']. "\n";
+?>
+--EXPECT--
+udp_socket