zec
/
halo2
mirror of https://github.com/zcash/halo2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Check both u64 max and min in ValueSum arithemetic.

This commit is contained in:
Kris Nuttycombe 2021-05-04 16:33:08 -06:00
parent 4afdeeeb76
commit a789b89135
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/value.rs
View File

@ -69,11 +69,12 @@ impl NoteValue {
impl Sub for NoteValue {
type Output = Option<ValueSum>;
#[allow(clippy::suspicious_arithmetic_impl)]
fn sub(self, rhs: Self) -> Self::Output {
let a = self.0 as i128;
let b = rhs.0 as i128;
a.checked_sub(b)
.filter(|v| v > &(-(std::u64::MAX as i128)))
.filter(|v| v > &(-(std::u64::MAX as i128)) && v < &(std::u64::MAX as i128))
.map(ValueSum)
}
}
@ -100,10 +101,11 @@ impl ValueSum {
impl Add for ValueSum {
type Output = Option<ValueSum>;
#[allow(clippy::suspicious_arithmetic_impl)]
fn add(self, rhs: Self) -> Self::Output {
self.0
.checked_add(rhs.0)
.filter(|v| v < &(std::u64::MAX as i128))
.filter(|v| v > &(-(std::u64::MAX as i128)) && v < &(std::u64::MAX as i128))
.map(ValueSum)
}
}