Compare commits

...

1 Commits

Author SHA1 Message Date
Andrej Mihajlov c587874e47 Correct capacity argument when casting memory to sockaddr_* type.
The capacity argument indicates the number of instances of sockaddr_* and not
number of bytes within the pointer.

Signed-off-by: Andrej Mihajlov <and@mullvad.net>
2022-09-22 10:21:29 +02:00
@@ -8,7 +8,10 @@ extension IPv4Address {
init?(addrInfo: addrinfo) { init?(addrInfo: addrinfo) {
guard addrInfo.ai_family == AF_INET else { return nil } guard addrInfo.ai_family == AF_INET else { return nil }
let addressData = addrInfo.ai_addr.withMemoryRebound(to: sockaddr_in.self, capacity: MemoryLayout<sockaddr_in>.size) { ptr -> Data in let addressData = addrInfo.ai_addr.withMemoryRebound(
to: sockaddr_in.self,
capacity: 1
) { ptr -> Data in
return Data(bytes: &ptr.pointee.sin_addr, count: MemoryLayout<in_addr>.size) return Data(bytes: &ptr.pointee.sin_addr, count: MemoryLayout<in_addr>.size)
} }
@@ -20,7 +23,10 @@ extension IPv6Address {
init?(addrInfo: addrinfo) { init?(addrInfo: addrinfo) {
guard addrInfo.ai_family == AF_INET6 else { return nil } guard addrInfo.ai_family == AF_INET6 else { return nil }
let addressData = addrInfo.ai_addr.withMemoryRebound(to: sockaddr_in6.self, capacity: MemoryLayout<sockaddr_in6>.size) { ptr -> Data in let addressData = addrInfo.ai_addr.withMemoryRebound(
to: sockaddr_in6.self,
capacity: 1
) { ptr -> Data in
return Data(bytes: &ptr.pointee.sin6_addr, count: MemoryLayout<in6_addr>.size) return Data(bytes: &ptr.pointee.sin6_addr, count: MemoryLayout<in6_addr>.size)
} }