fix mem leaks and tests

Author: devnexen

ext/sockets/sockets.c

@@ -1698,6 +1698,7 @@ PHP_FUNCTION(socket_recvfrom)
 			zval *index = arg6;
 			if (recv_flags > 0 && !(recv_flags & (MSG_PEEK|MSG_DONTWAIT|MSG_ERRQUEUE))) {
 				zend_argument_value_error(4, "must set one the flags MSG_PEEK, MSG_DONTWAIT, MSG_ERRQUEUE");
+				zend_string_efree(recv_buf);
 				RETURN_THROWS();
 			}
 
@@ -1706,6 +1707,7 @@ PHP_FUNCTION(socket_recvfrom)
 			// TODO: SOCK_DGRAM support
 			if (protoid != SOCK_RAW) {
 				zend_argument_value_error(1, "must be SOCK_RAW socket type");
+				zend_string_efree(recv_buf);
 				RETURN_THROWS();
 			}
 			slen = sizeof(sll);
@@ -1724,9 +1726,8 @@ PHP_FUNCTION(socket_recvfrom)
 
 			ZEND_ASSERT(slen >= ETH_HLEN);
 
-			if (retval < recv_len) {
-				recv_buf = zend_string_truncate(recv_buf, retval, 0);
-			}
+			ZSTR_LEN(recv_buf) = retval;
+			ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0';
 
 			if (UNEXPECTED(!if_indextoname(sll.sll_ifindex, ifrname))) {
 				PHP_SOCKET_ERROR(php_sock, "unable to get the interface name", errno);

ext/sockets/tests/socket_afpacket_error.phpt

@@ -38,6 +38,12 @@ if (PHP_INT_SIZE != 8) {
         echo $e->getMessage(), PHP_EOL;
     }
 
+    try {
+    	socket_recvfrom($s_c, $rsp, strlen($buf), MSG_TRUNC, $addr);
+    } catch (\ValueError $e) {
+        echo $e->getMessage(), PHP_EOL;
+    }
+
     socket_close($s_s);
     socket_close($s_c);
 
@@ -267,6 +273,7 @@ if (PHP_INT_SIZE != 8) {
 --EXPECTF--
 int(%d)
 unsupported ethernet protocol
+socket_recvfrom(): Argument #4 ($flags) must set one the flags MSG_PEEK, MSG_DONTWAIT, MSG_ERRQUEUE
 int(60)
 invalid transport header length
 socket_sendto(): Argument #3 ($length) must be at least 60 for AF_PACKET
@@ -280,9 +287,9 @@ int(%d)
 bool(true)
 bool(true)
 int(%d)
-invalid ethernet loop header
 socket_sendto(): Argument #3 ($length) must be at least 60 for AF_PACKET
 int(%d)
+object(Socket\EthernetPacket)#1 (7) {
   ["headerSize"]=>
   int(14)
   ["rawPacket"]=>