Skip to content

Commit 11c6318

Browse files
committed
Use more obvious calculation for slice size check
1 parent 5d9086f commit 11c6318

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/libcore/slice/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3881,8 +3881,7 @@ unsafe impl<'a, T> TrustedRandomAccess for ExactChunksMut<'a, T> {
38813881
#[stable(feature = "rust1", since = "1.0.0")]
38823882
pub unsafe fn from_raw_parts<'a, T>(data: *const T, len: usize) -> &'a [T] {
38833883
debug_assert!(data as usize % mem::align_of::<T>() == 0, "attempt to create unaligned slice");
3884-
let size = mem::size_of::<T>();
3885-
debug_assert!(size == 0 || len < (isize::MAX as usize + size - 1) / size,
3884+
debug_assert!(mem::size_of::<T>().saturating_mul(len) <= isize::MAX as usize,
38863885
"attempt to create slice covering half the address space");
38873886
Repr { raw: FatPtr { data, len } }.rust
38883887
}
@@ -3905,8 +3904,7 @@ pub unsafe fn from_raw_parts<'a, T>(data: *const T, len: usize) -> &'a [T] {
39053904
#[stable(feature = "rust1", since = "1.0.0")]
39063905
pub unsafe fn from_raw_parts_mut<'a, T>(data: *mut T, len: usize) -> &'a mut [T] {
39073906
debug_assert!(data as usize % mem::align_of::<T>() == 0, "attempt to create unaligned slice");
3908-
let size = mem::size_of::<T>();
3909-
debug_assert!(size == 0 || len < (isize::MAX as usize + size - 1) / size,
3907+
debug_assert!(mem::size_of::<T>().saturating_mul(len) <= isize::MAX as usize,
39103908
"attempt to create slice covering half the address space");
39113909
Repr { raw: FatPtr { data, len } }.rust_mut
39123910
}

0 commit comments

Comments
 (0)