Adapted slice length fuzzy test to new rust nightly checks

JulianSchmid · Feb 11, 2024 · c516584 · c516584
1 parent b489fd9
commit c516584
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/etherparse/src/transport/icmpv6_header.rs b/etherparse/src/transport/icmpv6_header.rs
@@ -219,7 +219,7 @@ mod test {
             ip_header in ipv6_any(),
             icmp_type in icmpv6_type_any(),
             // max length is u32::MAX - header_len (7)
-            bad_len in (core::u32::MAX - 7) as usize..=core::usize::MAX,
+            bad_len in (core::u32::MAX - 7) as usize..=(core::isize::MAX as usize),
             payload in proptest::collection::vec(any::<u8>(), 0..1024)
         ) {
 
@@ -395,7 +395,7 @@ mod test {
             icmp_type in icmpv6_type_any(),
             start_checksum in any::<u16>(),
             // max length is u32::MAX - header_len (7)
-            bad_len in (core::u32::MAX - 7) as usize..=core::usize::MAX,
+            bad_len in (core::u32::MAX - 7) as usize..=(core::isize::MAX as usize),
             payload in proptest::collection::vec(any::<u8>(), 0..1024)
         ) {
 

diff --git a/etherparse/src/transport/icmpv6_slice.rs b/etherparse/src/transport/icmpv6_slice.rs
@@ -224,7 +224,7 @@ mod test {
         #[cfg(not(any(target_pointer_width = "16", target_pointer_width = "32")))]
         #[test]
         fn from_slice_too_big_error(
-            bad_len in ((core::u32::MAX as usize) + 1)..=core::usize::MAX,
+            bad_len in ((core::u32::MAX as usize) + 1)..=(core::isize::MAX as usize),
         ) {
             // too large packet error case
             {

diff --git a/etherparse/src/transport/icmpv6_type.rs b/etherparse/src/transport/icmpv6_type.rs
@@ -609,7 +609,7 @@ mod test {
             code_u8 in any::<u8>(),
             bytes5to8 in any::<[u8;4]>(),
             // max length is u32::MAX - header_len (7)
-            bad_len in (core::u32::MAX - 7) as usize..=core::usize::MAX,
+            bad_len in (core::u32::MAX - 7) as usize..=(core::isize::MAX as usize),
             payload in proptest::collection::vec(any::<u8>(), 0..64)
         ) {
             use Icmpv6Type::*;
@@ -718,7 +718,7 @@ mod test {
             ip_header in ipv6_any(),
             icmpv6_type in icmpv6_type_any(),
             // max length is u32::MAX - header_len (7)
-            bad_len in (core::u32::MAX - 7) as usize..=core::usize::MAX,
+            bad_len in (core::u32::MAX - 7) as usize..=(core::isize::MAX as usize),
             payload in proptest::collection::vec(any::<u8>(), 0..1024)
         ) {
             // size error case

diff --git a/etherparse/src/transport/udp_header.rs b/etherparse/src/transport/udp_header.rs
@@ -316,7 +316,7 @@ mod test {
             source_port in any::<u16>(),
             destination_port in any::<u16>(),
             good_payload_length in 0..=((core::u16::MAX as usize) - UdpHeader::LEN),
-            bad_payload_length in ((core::u16::MAX as usize) - UdpHeader::LEN + 1)..=usize::MAX,
+            bad_payload_length in ((core::u16::MAX as usize) - UdpHeader::LEN + 1)..=(isize::MAX as usize),
         ) {
 
             // normal working call
@@ -386,7 +386,7 @@ mod test {
             destination_port in any::<u16>(),
             ipv4 in ipv4_any(),
             payload in proptest::collection::vec(any::<u8>(), 0..20),
-            bad_len in ((core::u16::MAX as usize) - UdpHeader::LEN + 1)..=usize::MAX,
+            bad_len in ((core::u16::MAX as usize) - UdpHeader::LEN + 1)..=(isize::MAX as usize),
         ) {
             // normal case
             assert_eq!(
@@ -490,7 +490,7 @@ mod test {
             dummy_checksum in any::<u16>(),
             ipv4 in ipv4_any(),
             payload in proptest::collection::vec(any::<u8>(), 0..20),
-            bad_len in ((core::u16::MAX as usize) - UdpHeader::LEN + 1)..=usize::MAX,
+            bad_len in ((core::u16::MAX as usize) - UdpHeader::LEN + 1)..=(isize::MAX as usize),
         ) {
             // normal case
             {
@@ -620,7 +620,7 @@ mod test {
             destination_port in any::<u16>(),
             ipv6 in ipv6_any(),
             payload in proptest::collection::vec(any::<u8>(), 0..20),
-            bad_len in ((core::u16::MAX as usize) - UdpHeader::LEN + 1)..=usize::MAX,
+            bad_len in ((core::u16::MAX as usize) - UdpHeader::LEN + 1)..=(isize::MAX as usize),
         ) {
             // normal case
             assert_eq!(
@@ -723,7 +723,7 @@ mod test {
             destination_port in any::<u16>(),
             ipv6 in ipv6_any(),
             payload in proptest::collection::vec(any::<u8>(), 0..20),
-            bad_len in ((core::u32::MAX as usize) - UdpHeader::LEN + 1)..=usize::MAX,
+            bad_len in ((core::u32::MAX as usize) - UdpHeader::LEN + 1)..=(isize::MAX as usize),
         ) {
             // normal case
             assert_eq!(
@@ -827,7 +827,7 @@ mod test {
             dummy_checksum in any::<u16>(),
             ipv6 in ipv6_any(),
             payload in proptest::collection::vec(any::<u8>(), 0..20),
-            bad_len in ((core::u32::MAX as usize) - UdpHeader::LEN + 1)..=usize::MAX,
+            bad_len in ((core::u32::MAX as usize) - UdpHeader::LEN + 1)..=(isize::MAX as usize),
         ) {
             // normal case
             {