浏览代码

Fix buffer size check in UDP socket.

We were reserving 12 bytes from the buffer for ip, port, and length, but since
IPv6 introduction we should be reserving 24 (IPv6 are 16 bytes)

(cherry picked from commit 5dc7c920bf1c4bb160d39e13ad6136d80badd7ae)
Fabio Alessandrelli 8 年之前
父节点
当前提交
15ecdb5f00
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/unix/packet_peer_udp_posix.cpp
  2. 1 1
      platform/windows/packet_peer_udp_winsock.cpp

+ 1 - 1
drivers/unix/packet_peer_udp_posix.cpp

@@ -176,7 +176,7 @@ Error PacketPeerUDPPosix::_poll(bool p_wait) {
 	struct sockaddr_storage from = { 0 };
 	socklen_t len = sizeof(struct sockaddr_storage);
 	int ret;
-	while ((ret = recvfrom(sockfd, recv_buffer, MIN((int)sizeof(recv_buffer), MAX(rb.space_left() - 12, 0)), p_wait ? 0 : MSG_DONTWAIT, (struct sockaddr *)&from, &len)) > 0) {
+	while ((ret = recvfrom(sockfd, recv_buffer, MIN((int)sizeof(recv_buffer), MAX(rb.space_left() - 24, 0)), p_wait ? 0 : MSG_DONTWAIT, (struct sockaddr *)&from, &len)) > 0) {
 
 		uint32_t port = 0;
 

+ 1 - 1
platform/windows/packet_peer_udp_winsock.cpp

@@ -171,7 +171,7 @@ Error PacketPeerUDPWinsock::_poll(bool p_wait) {
 	struct sockaddr_storage from = { 0 };
 	int len = sizeof(struct sockaddr_storage);
 	int ret;
-	while ((ret = recvfrom(sockfd, (char *)recv_buffer, MIN((int)sizeof(recv_buffer), MAX(rb.space_left() - 12, 0)), 0, (struct sockaddr *)&from, &len)) > 0) {
+	while ((ret = recvfrom(sockfd, (char *)recv_buffer, MIN((int)sizeof(recv_buffer), MAX(rb.space_left() - 24, 0)), 0, (struct sockaddr *)&from, &len)) > 0) {
 
 		uint32_t port = 0;