Skip to content

Android: update pread/pwrite for nullability annotations in NDK 26 #148

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

Merged
glessard merged 4 commits into from
Mar 20, 2024
Merged

Android: update pread/pwrite for nullability annotations in NDK 26 #148

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c3617b
Android: update pread/pwrite for nullability annotations in NDK 26
finagolfin Nov 24, 2023
c2e8f24
avoid passing null pointer to pread() or pwrite()
glessard Jan 5, 2024
1459733
[test] test reading and writing empty, nil-based buffers
glessard Jan 6, 2024
5ca37e7
Android: more targeted approach to unusual nullabilities
glessard Mar 8, 2024
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
Prev Previous commit
Android: more targeted approach to unusual nullabilities
  • Loading branch information
@glessard
glessard committed Mar 11, 2024
commit 5ca37e7d3997b00e19d4a77d45db7830b18b6f56
20 changes: 18 additions & 2 deletions Sources/System/Internals/Syscalls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,15 @@ internal func system_pread(
#if ENABLE_MOCKING
if mockingEnabled { return _mockInt(fd, buf, nbyte, offset) }
#endif
return buf.map({ pread(fd, $0, nbyte, offset) }) ?? 0
#if os(Android)
var zero = UInt8.zero
return withUnsafeMutablePointer(to: &zero) {
// this pread has a non-nullable `buf` pointer
pread(fd, buf ?? UnsafeMutableRawPointer($0), nbyte, offset)
}
#else
return pread(fd, buf, nbyte, offset)
#endif
}

// lseek
Expand Down Expand Up @@ -101,7 +109,15 @@ internal func system_pwrite(
#if ENABLE_MOCKING
if mockingEnabled { return _mockInt(fd, buf, nbyte, offset) }
#endif
return buf.map({ pwrite(fd, $0, nbyte, offset) }) ?? 0
#if os(Android)
var zero = UInt8.zero
return withUnsafeMutablePointer(to: &zero) {
// this pwrite has a non-nullable `buf` pointer
pwrite(fd, buf ?? UnsafeRawPointer($0), nbyte, offset)
}
#else
return pwrite(fd, buf, nbyte, offset)
#endif
}

internal func system_dup(_ fd: Int32) -> Int32 {
Expand Down