rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

iOS/tvOS/watchOS: Fix alloc w. large alignment on older versions

Browse Source 
Tested on an old MacBook and the iOS simulator.
This commit is contained in:
Mads Marquart
2024-05-06 07:56:41 +02:00
parent aa606bb246
commit 53bd38b7c5
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/std/src/sys/pal/unix/alloc.rs
View File

@@ -13,7 +13,13 @@ unsafe impl GlobalAlloc for System {
if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() { if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
libc::malloc(layout.size()) as *mut u8 libc::malloc(layout.size()) as *mut u8
} else { } else {
#[cfg(target_os = "macos")] // `posix_memalign` returns a non-aligned value if supplied a very
// large alignment on older versions of Apple's platforms (unknown
// exactly which version range, but the issue is definitely
// present in macOS 10.14 and iOS 13.3).
//
// <https://github.com/rust-lang/rust/issues/30170>
#[cfg(target_vendor = "apple")]
{ {
if layout.align() > (1 << 31) { if layout.align() > (1 << 31) {
return ptr::null_mut(); return ptr::null_mut();