From 3c990131817b287ba2df661d050f8c533b9c4380 Mon Sep 17 00:00:00 2001 From: daladim Date: Fri, 12 Feb 2021 18:01:38 +0100 Subject: [PATCH] [review] More explicit size for SOCKADDR_IN --- heim-net/src/sys/windows/nic.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/heim-net/src/sys/windows/nic.rs b/heim-net/src/sys/windows/nic.rs index 013cab01..55677605 100644 --- a/heim-net/src/sys/windows/nic.rs +++ b/heim-net/src/sys/windows/nic.rs @@ -12,6 +12,7 @@ use winapi::shared::minwindef::ULONG; use winapi::shared::ntdef::NULL; use winapi::shared::ws2def::SOCKET_ADDRESS; use winapi::shared::ws2ipdef::SOCKADDR_IN6; +use winapi::shared::ws2def::SOCKADDR_IN; use winapi::shared::ws2def::{AF_INET, AF_INET6}; use winapi::shared::ws2def::AF_UNSPEC; use winapi::shared::winerror::{ERROR_BUFFER_OVERFLOW, NO_ERROR}; @@ -38,7 +39,7 @@ fn sockaddr_to_ipv4(sa: SOCKET_ADDRESS) -> Option
{ // Check this sockaddr can fit one short and a char[14] // (see https://docs.microsoft.com/en-us/windows/win32/winsock/sockaddr-2) // This should always happen though, this is guaranteed by winapi's interface - if sa.iSockaddrLength < 2+14 { + if (sa.iSockaddrLength as usize) < std::mem::size_of::() { return None; }