fix object creation

Author: devnexen

ext/sockets/sockets.c

@@ -1655,10 +1655,11 @@ PHP_FUNCTION(socket_recvfrom)
 			unsigned short protocol = ntohs(e->h_proto);
 			unsigned char *payload = ((unsigned char *)e + sizeof(struct ethhdr));
 
-			object_init_ex(arg2, socket_ethinfo_ce);
-			zend_update_property_string(Z_OBJCE_P(arg2), Z_OBJ_P(arg2), ZEND_STRL("macsrc"), ether_ntoa((struct ether_addr *)e->h_source));
-			zend_update_property_string(Z_OBJCE_P(arg2), Z_OBJ_P(arg2), ZEND_STRL("macdst"), ether_ntoa((struct ether_addr *)e->h_dest));
-			zend_update_property_long(Z_OBJCE_P(arg2), Z_OBJ_P(arg2), ZEND_STRL("ethprotocol"), protocol);
+			zval obj;
+			object_init_ex(&obj, socket_ethinfo_ce);
+			zend_update_property_string(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("macsrc"), ether_ntoa((struct ether_addr *)e->h_source));
+			zend_update_property_string(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("macdst"), ether_ntoa((struct ether_addr *)e->h_dest));
+			zend_update_property_long(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("ethprotocol"), protocol);
 			array_init(&zpayload);
 
 			switch (protocol) {
@@ -1713,10 +1714,14 @@ PHP_FUNCTION(socket_recvfrom)
 					RETURN_THROWS();
 			}
 
-			zend_update_property(Z_OBJCE_P(arg2), Z_OBJ_P(arg2), ZEND_STRL("payload"), &zpayload);
+			zend_update_property(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("payload"), &zpayload);
 
+			ZEND_TRY_ASSIGN_REF_COPY(arg2, &obj);
 			ZEND_TRY_ASSIGN_REF_STRING(arg5, ifrname);
-			ZEND_TRY_ASSIGN_REF_LONG(arg6, sll.sll_ifindex);
+
+			if (arg6) {
+				ZEND_TRY_ASSIGN_REF_LONG(arg6, sll.sll_ifindex);
+			}
 			break;
 #endif
 		default:

ext/sockets/tests/socket_afpacket.phpt

@@ -30,10 +30,11 @@ if (!function_exists("posix_getuid") || posix_getuid() != 0) {
     $s_s     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_ALL);
     $v_bind  = socket_bind($s_s, 'lo');
 
-    $buf = str_pad(str_repeat("0", ETH_FRAME_LEN) .
+    $buf = str_repeat("0", ETH_FRAME_LEN) .
 	   str_repeat("\xFF", 6) .
 	   str_repeat("\x11", 6) .
-	   "\x08\x00TEST ethernet", 2048, "\x00");
+	   "\x08\x00" .
+	   str_pad(str_repeat("test", 512), 2048, "\x00");
 
     var_dump(socket_sendto($s_s, $buf, strlen($buf), 0, "lo", 1));
 
@@ -47,4 +48,4 @@ string(2) "lo"
 int(%i)
 
 Warning: socket_getpeername(): unable to retrieve peer name [95]: %sot supported in %s on line %d
-int(2048)
+int(3576)