fix leaks on failure

Author: devnexen

ext/sockets/sockets.c

@@ -1657,9 +1657,6 @@ PHP_FUNCTION(socket_recvfrom)
 
 			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) {
@@ -1710,10 +1707,16 @@ PHP_FUNCTION(socket_recvfrom)
 					break;
 				}
 				default:
+					zend_string_efree(recv_buf);
+                                        zval_ptr_dtor(&zpayload);
+                                        zval_ptr_dtor(&obj);
 					zend_value_error("unsupported ethernet protocol");
 					RETURN_THROWS();
 			}
 
+			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);
 			zend_update_property(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("payload"), &zpayload);
 
 			ZEND_TRY_ASSIGN_REF_COPY(arg2, &obj);
@@ -1745,6 +1748,7 @@ PHP_FUNCTION(socket_sendto)
 #endif
 #ifdef AF_PACKET
 	struct sockaddr_ll      sll;
+	unsigned char           halen;
 #endif
 	int					retval;
 	size_t              buf_len, addr_len;
@@ -1826,17 +1830,20 @@ PHP_FUNCTION(socket_sendto)
 				RETURN_THROWS();
 			}
 
+			halen = addr_len > ETH_ALEN ? ETH_ALEN : (unsigned char)addr_len;
+
 			memset(&sll, 0, sizeof(sll));			
+			memcpy(sll.sll_addr, addr, halen);
 			sll.sll_family = AF_PACKET;
 			sll.sll_ifindex = port;
-			sll.sll_halen = ETH_ALEN;
+			sll.sll_halen = halen;
 
 			// TODO allows to use more user friendly type to replace raw buffer usage
 			retval = sendto(php_sock->bsd_socket, buf, ((size_t)len > buf_len) ? buf_len : (size_t)len, flags, (struct sockaddr *) &sll, sizeof(sll));
 			break;
 #endif
 		default:
-			zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET, or AF_INET6");
+			zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET, AF_PACKET or AF_INET6");
 			RETURN_THROWS();
 	}
 

ext/sockets/tests/socket_afpacket.phpt

@@ -15,7 +15,7 @@ if (!function_exists("posix_getuid") || posix_getuid() != 0) {
 ?>
 --FILE--
 <?php
-    $s_c     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_ALL);
+    $s_c     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_IP);
     $s_bind  = socket_bind($s_c, 'lo');
     var_dump($s_bind);
 
@@ -26,19 +26,6 @@ if (!function_exists("posix_getuid") || posix_getuid() != 0) {
     var_dump($iindex);
 
     socket_getpeername($s_c, $istr2, $iindex2);
-
-    $s_s     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_ALL);
-    $v_bind  = socket_bind($s_s, 'lo');
-
-    $buf = str_repeat("0", ETH_FRAME_LEN) .
-	   str_repeat("\xFF", 6) .
-	   str_repeat("\x11", 6) .
-	   "\x08\x00" .
-	   str_pad(str_repeat("test", 512), 2048, "\x00");
-
-    var_dump(socket_sendto($s_s, $buf, strlen($buf), 0, "lo", 1));
-
-    socket_close($s_s);
     socket_close($s_c);
 ?>
 --EXPECTF--
@@ -48,4 +35,3 @@ string(2) "lo"
 int(%i)
 
 Warning: socket_getpeername(): unable to retrieve peer name [95]: %sot supported in %s on line %d
-int(3576)