grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #37 from gavofyork/gav

Browse Source 
Avoid panicking on oversize u64.
This commit is contained in:
Marek Kotewicz 2016-01-12 00:16:11 +01:00
commit 584bcda7d5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bytes.rs
View File

@ -264,7 +264,7 @@ impl FromBytes for u64 {
fn from_bytes(bytes: &[u8]) -> FromBytesResult<u64> { fn from_bytes(bytes: &[u8]) -> FromBytesResult<u64> {
match bytes.len() { match bytes.len() {
0 => Ok(0), 0 => Ok(0),
l => { l @ 1...8 => {
let mut res = 0u64; let mut res = 0u64;
for i in 0..l { for i in 0..l {
let shift = (l - 1 - i) * 8; let shift = (l - 1 - i) * 8;
@ -272,6 +272,7 @@ impl FromBytes for u64 {
} }
Ok(res) Ok(res)
} }
_ => Err(FromBytesError::DataIsTooLong)
} }
} }
} }