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

Merge pull request #805 from upbqdn/use-u64-for-byte_count 

Fix a theoretical possibility of overflow leading to panic
This commit is contained in:
str4d 2023-04-11 13:01:38 +01:00 committed by GitHub
parent 47c3159968 c9f55a4c5d
commit 4f0dd218c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zcash_proofs/src/hashreader.rs
View File

@ -11,7 +11,7 @@ use blake2b_simd::State;
pub struct HashReader<R: Read> { pub struct HashReader<R: Read> {
reader: R, reader: R,
hasher: State, hasher: State,
byte_count: usize, byte_count: u64,
} }
impl<R: Read> HashReader<R> { impl<R: Read> HashReader<R> {
@ -37,7 +37,7 @@ impl<R: Read> HashReader<R> {
} }
/// Return the number of bytes read so far. /// Return the number of bytes read so far.
pub fn byte_count(&self) -> usize { pub fn byte_count(&self) -> u64 {
self.byte_count self.byte_count
} }
} }
@ -48,7 +48,13 @@ impl<R: Read> Read for HashReader<R> {
if bytes > 0 { if bytes > 0 {
self.hasher.update(&buf[0..bytes]); self.hasher.update(&buf[0..bytes]);
self.byte_count += bytes; let byte_count = u64::try_from(bytes).map_err(|_| {
io::Error::new(
io::ErrorKind::InvalidData,
"Could not fit the number of read bytes into u64.",
)
})?;
self.byte_count += byte_count;
} }
Ok(bytes) Ok(bytes)