Skip to content

Commit

Permalink
Avoid overflow in std::iter::Skip::count
Browse files Browse the repository at this point in the history
The call to `count` on the inner iterator can overflow even if `Skip` itself would return less that `usize::max_value()` items.
  • Loading branch information
ollie27 committed Jan 22, 2020
1 parent 900811e commit 9d3e844
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/libcore/iter/adapters/mod.rs
Expand Up @@ -1815,8 +1815,14 @@ where
}

#[inline]
fn count(self) -> usize {
self.iter.count().saturating_sub(self.n)
fn count(mut self) -> usize {
if self.n > 0 {
// nth(n) skips n+1
if self.iter.nth(self.n - 1).is_none() {
return 0;
}
}
self.iter.count()
}

#[inline]
Expand Down
8 changes: 8 additions & 0 deletions src/test/ui/iterators/skip-count-overflow.rs
@@ -0,0 +1,8 @@
// run-pass
// only-32bit too impatient for 2⁶⁴ items
// compile-flags: -C overflow-checks -C opt-level=3

fn main() {
let i = (0..usize::max_value()).chain(0..10).skip(usize::max_value());
assert_eq!(i.count(), 10);
}

0 comments on commit 9d3e844

Please sign in to comment.