Skip to content

Unwrap inet_ntop's dst pointer once, for Bionic #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
germ-mark wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Unwrap inet_ntop's dst pointer once, for Bionic #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions Sources/AsyncDNSResolver/c-ares/DNSResolver_c-ares.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,19 +607,25 @@ extension IPAddress.IPv6 {
func sys_inet_ntop(family: CInt, bytes: UnsafeRawPointer, length: Int) -> String? {
var addressBytes: [Int8] = Array(repeating: 0, count: length)
return addressBytes.withUnsafeMutableBufferPointer { addressBytesPtr -> String? in
// The returned pointer is the same as addressBytesPtr.baseAddress but nil on error.
// Unwrapped once here because Bionic annotates `dst` as `char * _Nonnull`, so it
// imports as a non-optional pointer; Darwin, Glibc and WinSDK import it as optional.
guard let destination = addressBytesPtr.baseAddress else {
return nil
}

// The returned pointer is the same as destination but nil on error.
#if os(Windows)
// On Windows `inet_ntop`'s size argument is `size_t` (imported as `Int`).
if inet_ntop(family, bytes, addressBytesPtr.baseAddress, length) == nil {
if inet_ntop(family, bytes, destination, length) == nil {
return nil
}
#else
if inet_ntop(family, bytes, addressBytesPtr.baseAddress, socklen_t(length)) == nil {
if inet_ntop(family, bytes, destination, socklen_t(length)) == nil {
return nil
}
#endif

return addressBytesPtr.baseAddress!.withMemoryRebound(
return destination.withMemoryRebound(
to: UInt8.self,
capacity: addressBytesPtr.count
) {
Expand Down