milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Add encode::Error::NonMinimalVarInt variant

This commit is contained in:
Steven Roose 2019-09-09 11:12:34 +01:00
parent d02318f423
commit 1eeaccc92e
No known key found for this signature in database
GPG Key ID: 2F2A88D7F8D68E87
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/consensus/encode.rs
View File

@ -76,6 +76,8 @@ pub enum Error {
/// The invalid checksum /// The invalid checksum
actual: [u8; 4], actual: [u8; 4],
}, },
/// VarInt was encoded in a non-minimal way
NonMinimalVarInt,
/// Network magic was unknown /// Network magic was unknown
UnknownNetworkMagic(u32), UnknownNetworkMagic(u32),
/// Parsing error /// Parsing error
@ -100,6 +102,7 @@ impl fmt::Display for Error {
"allocation of oversized vector: requested {}, maximum {}", r, m), "allocation of oversized vector: requested {}, maximum {}", r, m),
Error::InvalidChecksum { expected: ref e, actual: ref a } => write!(f, Error::InvalidChecksum { expected: ref e, actual: ref a } => write!(f,
"invalid checksum: expected {}, actual {}", e.to_hex(), a.to_hex()), "invalid checksum: expected {}, actual {}", e.to_hex(), a.to_hex()),
Error::NonMinimalVarInt => write!(f, "non-minimal varint"),
Error::UnknownNetworkMagic(ref m) => write!(f, "unknown network magic: {}", m), Error::UnknownNetworkMagic(ref m) => write!(f, "unknown network magic: {}", m),
Error::ParseFailed(ref e) => write!(f, "parse failed: {}", e), Error::ParseFailed(ref e) => write!(f, "parse failed: {}", e),
Error::UnsupportedSegwitFlag(ref swflag) => write!(f, Error::UnsupportedSegwitFlag(ref swflag) => write!(f,
@ -120,6 +123,7 @@ impl error::Error for Error {
Error::UnexpectedNetworkMagic { .. } Error::UnexpectedNetworkMagic { .. }
| Error::OversizedVectorAllocation { .. } | Error::OversizedVectorAllocation { .. }
| Error::InvalidChecksum { .. } | Error::InvalidChecksum { .. }
| Error::NonMinimalVarInt
| Error::UnknownNetworkMagic(..) | Error::UnknownNetworkMagic(..)
| Error::ParseFailed(..) | Error::ParseFailed(..)
| Error::UnsupportedSegwitFlag(..) | Error::UnsupportedSegwitFlag(..)
@ -425,7 +429,7 @@ impl Decodable for VarInt {
0xFF => { 0xFF => {
let x = ReadExt::read_u64(&mut d)?; let x = ReadExt::read_u64(&mut d)?;
if x < 0x100000000 { if x < 0x100000000 {
Err(self::Error::ParseFailed("non-minimal varint")) Err(self::Error::NonMinimalVarInt)
} else { } else {
Ok(VarInt(x)) Ok(VarInt(x))
} }
@ -433,7 +437,7 @@ impl Decodable for VarInt {
0xFE => { 0xFE => {
let x = ReadExt::read_u32(&mut d)?; let x = ReadExt::read_u32(&mut d)?;
if x < 0x10000 { if x < 0x10000 {
Err(self::Error::ParseFailed("non-minimal varint")) Err(self::Error::NonMinimalVarInt)
} else { } else {
Ok(VarInt(x as u64)) Ok(VarInt(x as u64))
} }
@ -441,7 +445,7 @@ impl Decodable for VarInt {
0xFD => { 0xFD => {
let x = ReadExt::read_u16(&mut d)?; let x = ReadExt::read_u16(&mut d)?;
if x < 0xFD { if x < 0xFD {
Err(self::Error::ParseFailed("non-minimal varint")) Err(self::Error::NonMinimalVarInt)
} else { } else {
Ok(VarInt(x as u64)) Ok(VarInt(x as u64))
} }
@ -791,27 +795,27 @@ mod tests {
#[test] #[test]
fn deserialize_nonminimal_vec() { fn deserialize_nonminimal_vec() {
match deserialize::<Vec<u8>>(&[0xfd, 0x00, 0x00]) { match deserialize::<Vec<u8>>(&[0xfd, 0x00, 0x00]) {
Err(Error::ParseFailed("non-minimal varint")) => {}, Err(Error::NonMinimalVarInt) => {},
x => panic!(x) x => panic!(x)
} }
match deserialize::<Vec<u8>>(&[0xfd, 0xfc, 0x00]) { match deserialize::<Vec<u8>>(&[0xfd, 0xfc, 0x00]) {
Err(Error::ParseFailed("non-minimal varint")) => {}, Err(Error::NonMinimalVarInt) => {},
x => panic!(x) x => panic!(x)
} }
match deserialize::<Vec<u8>>(&[0xfe, 0xff, 0x00, 0x00, 0x00]) { match deserialize::<Vec<u8>>(&[0xfe, 0xff, 0x00, 0x00, 0x00]) {
Err(Error::ParseFailed("non-minimal varint")) => {}, Err(Error::NonMinimalVarInt) => {},
x => panic!(x) x => panic!(x)
} }
match deserialize::<Vec<u8>>(&[0xfe, 0xff, 0xff, 0x00, 0x00]) { match deserialize::<Vec<u8>>(&[0xfe, 0xff, 0xff, 0x00, 0x00]) {
Err(Error::ParseFailed("non-minimal varint")) => {}, Err(Error::NonMinimalVarInt) => {},
x => panic!(x) x => panic!(x)
} }
match deserialize::<Vec<u8>>(&[0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]) { match deserialize::<Vec<u8>>(&[0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]) {
Err(Error::ParseFailed("non-minimal varint")) => {}, Err(Error::NonMinimalVarInt) => {},
x => panic!(x) x => panic!(x)
} }
match deserialize::<Vec<u8>>(&[0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00]) { match deserialize::<Vec<u8>>(&[0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00]) {
Err(Error::ParseFailed("non-minimal varint")) => {}, Err(Error::NonMinimalVarInt) => {},
x => panic!(x) x => panic!(x)
} }