Skip to content

Commit

Permalink
Merge #385
Browse files Browse the repository at this point in the history
385: Fix potential overflow in MergeJoinBy::size_hint r=jswrenn a=andrewhickman



Co-authored-by: Andrew Hickman <andrew.hickman1@sky.com>
  • Loading branch information
bors[bot] and andrewhickman committed Dec 3, 2019
2 parents dd7fd96 + 9f41c18 commit ba24605
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/merge_join.rs
Expand Up @@ -78,7 +78,7 @@ impl<I, J, F> Iterator for MergeJoinBy<I, J, F>
let lower = ::std::cmp::max(a_lower, b_lower);

let upper = match (a_upper, b_upper) {
(Some(x), Some(y)) => Some(x + y),
(Some(x), Some(y)) => x.checked_add(y),
_ => None,
};

Expand Down

0 comments on commit ba24605

Please sign in to comment.