starkware-libs
diff --git a/‎corelib/src/iter/adapters/take.cairo‎
Lines changed: 3 additions & 2 deletions b/‎corelib/src/iter/adapters/take.cairo‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎corelib/src/test/iter_test.cairo‎
Lines changed: 4 additions & 0 deletions b/‎corelib/src/test/iter_test.cairo‎
Lines changed: 4 additions & 0 deletions
@@ -1,4 +1,4 @@
-use crate::num::traits::CheckedSub;
+use crate::num::traits::{CheckedAdd, CheckedSub};
 
 /// An iterator that only iterates over the first `n` iterations of `iter`.
 ///
@@ -29,7 +29,8 @@ impl TakeIterator<I, impl TIter: Iterator<I>, +Drop<I>> of Iterator<Take<I>> {
     fn nth<+Destruct<Take<I>>, +Destruct<Self::Item>>(
         ref self: Take<I>, n: usize,
     ) -> Option<Self::Item> {
-        if let Some(updated_n) = self.n.checked_sub(n + 1) {
+        if let Some(n_plus_1) = n.checked_add(1)
+            && let Some(updated_n) = self.n.checked_sub(n_plus_1) {
             self.n = updated_n;
             self.iter.nth(n)
         } else {
 
@@ -135,6 +135,10 @@ fn test_iter_adapter_take_nth() {
     // Test when n = 0
     let mut iter = (1_u8..=3).into_iter().take(0);
     assert_eq!(iter.nth(0), None);
+
+    // `nth(usize::MAX)` must return `None`, not overflow on `n + 1`.
+    let mut iter = (1_u8..=10).into_iter().take(5);
+    assert_eq!(iter.nth(core::num::traits::Bounded::<usize>::MAX), None);
 }
 
 #[test]