diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 18:31:44 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 18:31:44 +0000 |
| commit | c23a457e72abe608715ac76f076f47dc42af07a5 (patch) | |
| tree | 2772049aaf84b5c9d0ed12ec8d86812f7a7904b6 /vendor/memmap2/src/windows.rs | |
| parent | Releasing progress-linux version 1.73.0+dfsg1-1~progress7.99u1. (diff) | |
| download | rustc-c23a457e72abe608715ac76f076f47dc42af07a5.tar.xz rustc-c23a457e72abe608715ac76f076f47dc42af07a5.zip | |
Merging upstream version 1.74.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/memmap2/src/windows.rs')
| -rw-r--r-- | vendor/memmap2/src/windows.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vendor/memmap2/src/windows.rs b/vendor/memmap2/src/windows.rs index c1b1a4d9f..537336904 100644 --- a/vendor/memmap2/src/windows.rs +++ b/vendor/memmap2/src/windows.rs @@ -132,9 +132,12 @@ extern "system" { fn GetSystemInfo(lpSystemInfo: LPSYSTEM_INFO); } -/// Returns a fixed pointer that is valid for `slice::from_raw_parts::<u8>` with `len == 0`. +/// Returns a fixed aligned pointer that is valid for `slice::from_raw_parts::<u8>` with `len == 0`. +/// +/// This aligns the pointer to `allocation_granularity()` or 1 if unknown. fn empty_slice_ptr() -> *mut c_void { - std::ptr::NonNull::<u8>::dangling().cast().as_ptr() + let align = allocation_granularity().max(1); + unsafe { mem::transmute(align) } } pub struct MmapInner { |