address remaining remarks

Author: devnexen

ext/sockets/sockets.c

@@ -1462,7 +1462,7 @@ static zend_result php_socket_get_chunk(zend_string *dst, const zend_string *src
 }
 
 static zend_result php_socket_afpacket_add_tcp(unsigned char *ipdata, struct sockaddr_ll sll, char *ifrname, zend_string *recv_buf,
-					       size_t slen, zval *szpayload,  zval *zpayload, zval *obj, zval *arg2, zval *arg5, zval *arg6) {
+					       size_t slen, zval *szpayload,  zval *zpayload, zval *obj, zval *arg2, zval *arg5, zval *arg6, size_t headersize) {
 	struct tcphdr a;
 	ETH_SUB_CHECKLENGTH(a, "TCP");
 	struct tcphdr *tcp = &a;
@@ -1471,23 +1471,22 @@ static zend_result php_socket_afpacket_add_tcp(unsigned char *ipdata, struct soc
 	zend_update_property_long(Z_OBJCE_P(szpayload), Z_OBJ_P(szpayload), ZEND_STRL("srcPort"), ntohs(tcp->th_sport));
 	zend_update_property_long(Z_OBJCE_P(szpayload), Z_OBJ_P(szpayload), ZEND_STRL("dstPort"), ntohs(tcp->th_dport));
 	zend_update_property_long(Z_OBJCE_P(szpayload), Z_OBJ_P(szpayload), ZEND_STRL("headerSize"), sizeof(*tcp));
-	zend_update_property_stringl(Z_OBJCE_P(szpayload), Z_OBJ_P(szpayload), ZEND_STRL("rawPacket"), (char *)ipdata, sizeof(*tcp));
+	zend_update_property_stringl(Z_OBJCE_P(szpayload), Z_OBJ_P(szpayload), ZEND_STRL("rawPacket"), (char *)ipdata, headersize);
 	zend_update_property(Z_OBJCE_P(zpayload), Z_OBJ_P(zpayload), ZEND_STRL("payload"), szpayload);
 	Z_DELREF_P(szpayload);
 	return SUCCESS;
 }
 
 static zend_result php_socket_afpacket_add_udp(unsigned char *ipdata, struct sockaddr_ll sll, char *ifrname, zend_string *recv_buf,
-					       size_t slen, zval *szpayload,  zval *zpayload, zval *obj, zval *arg2, zval *arg5, zval *arg6) {
+					       size_t slen, zval *szpayload,  zval *zpayload, zval *obj, zval *arg2, zval *arg5, zval *arg6, size_t headersize) {
 	struct udphdr a;
 	ETH_SUB_CHECKLENGTH(a, "UDP");
 	struct udphdr *udp = &a;
 	memcpy(udp, ipdata, sizeof(*udp));
-	size_t headersize = sizeof(*udp);
 	object_init_ex(szpayload, udppacket_ce);
 	zend_update_property_long(Z_OBJCE_P(szpayload), Z_OBJ_P(szpayload), ZEND_STRL("srcPort"), ntohs(udp->uh_sport));
 	zend_update_property_long(Z_OBJCE_P(szpayload), Z_OBJ_P(szpayload), ZEND_STRL("dstPort"), ntohs(udp->uh_dport));
-	zend_update_property_long(Z_OBJCE_P(szpayload), Z_OBJ_P(szpayload), ZEND_STRL("headerSize"), headersize);
+	zend_update_property_long(Z_OBJCE_P(szpayload), Z_OBJ_P(szpayload), ZEND_STRL("headerSize"), sizeof(*udp));
 	zend_update_property_stringl(Z_OBJCE_P(szpayload), Z_OBJ_P(szpayload), ZEND_STRL("rawPacket"), (char *)ipdata, headersize);
 	zend_update_property(Z_OBJCE_P(zpayload), Z_OBJ_P(zpayload), ZEND_STRL("payload"), szpayload);
 	Z_DELREF_P(szpayload);
@@ -1775,7 +1774,7 @@ PHP_FUNCTION(socket_recvfrom)
 					size_t tlayer = ip->ihl * 4;
 					size_t totalip = ntohs(ip->tot_len);
 
-					if (tlayer < sizeof(*ip) || totalip < tlayer || totalip < slen) {
+					if (php_socket_get_chunk(dst_buf, recv_buf, tlayer, totalip)) {
 						ZVAL_NULL(&zpayload);
 						zend_update_property(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("payload"), &zpayload);
 						zend_update_property_stringl(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("rawPacket"), ZSTR_VAL(recv_buf), ZSTR_LEN(recv_buf));
@@ -1809,7 +1808,7 @@ PHP_FUNCTION(socket_recvfrom)
 								RETURN_THROWS();
 							}
 							unsigned char *ipdata = (unsigned char *)ZSTR_VAL(dst_buf);
-							if (php_socket_afpacket_add_tcp(ipdata, sll, ifrname, recv_buf, slen, &szpayload, &zpayload, &obj, arg2, arg5, arg6) == FAILURE) {
+							if (php_socket_afpacket_add_tcp(ipdata, sll, ifrname, recv_buf, slen, &szpayload, &zpayload, &obj, arg2, arg5, arg6, ZSTR_LEN(dst_buf)) == FAILURE) {
 								zend_string_release(dst_buf);
 								zend_string_efree(recv_buf);
 								RETURN_THROWS();
@@ -1824,7 +1823,7 @@ PHP_FUNCTION(socket_recvfrom)
 								RETURN_THROWS();
 							}
 							unsigned char *ipdata = (unsigned char *)ZSTR_VAL(dst_buf);
-							if (php_socket_afpacket_add_udp(ipdata, sll, ifrname, recv_buf, slen, &szpayload, &zpayload, &obj, arg2, arg5, arg6) == FAILURE) {
+							if (php_socket_afpacket_add_udp(ipdata, sll, ifrname, recv_buf, slen, &szpayload, &zpayload, &obj, arg2, arg5, arg6, ZSTR_LEN(dst_buf)) == FAILURE) {
 								zend_string_release(dst_buf);
 								zend_string_efree(recv_buf);
 								RETURN_THROWS();
@@ -1895,7 +1894,7 @@ PHP_FUNCTION(socket_recvfrom)
 								RETURN_THROWS();
 							}
 							unsigned char *ipdata = (unsigned char *)ZSTR_VAL(dst_buf);
-							if (php_socket_afpacket_add_tcp(ipdata, sll, ifrname, recv_buf, slen, &szpayload, &zpayload, &obj, arg2, arg5, arg6) == FAILURE) {
+							if (php_socket_afpacket_add_tcp(ipdata, sll, ifrname, recv_buf, slen, &szpayload, &zpayload, &obj, arg2, arg5, arg6, ZSTR_LEN(dst_buf)) == FAILURE) {
 								zend_string_release(dst_buf);
 								zend_string_efree(recv_buf);
 								RETURN_THROWS();
@@ -1910,7 +1909,7 @@ PHP_FUNCTION(socket_recvfrom)
 								RETURN_THROWS();
 							}
 							unsigned char *ipdata = (unsigned char *)ZSTR_VAL(dst_buf);
-							if (php_socket_afpacket_add_udp(ipdata, sll, ifrname, recv_buf, slen, &szpayload, &zpayload, &obj, arg2, arg5, arg6) == FAILURE) {
+							if (php_socket_afpacket_add_udp(ipdata, sll, ifrname, recv_buf, slen, &szpayload, &zpayload, &obj, arg2, arg5, arg6, ZSTR_LEN(dst_buf)) == FAILURE) {
 								zend_string_release(dst_buf);
 								zend_string_efree(recv_buf);
 								RETURN_THROWS();