X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Futil%2Fser.rs;fp=src%2Futil%2Fser.rs;h=1944519d05316186f3bec612ac8d5b8612523e0c;hb=c3e225597d3981410644b84ad1e7b02c7a6bc7c7;hp=0a247d41a67d532c3ffd77c6ad2ff2938760fadc;hpb=f27c74b35cb4a9b5f44776ac6d3934e74143d51b;p=rust-lightning diff --git a/src/util/ser.rs b/src/util/ser.rs index 0a247d41..1944519d 100644 --- a/src/util/ser.rs +++ b/src/util/ser.rs @@ -183,7 +183,7 @@ impl Readable for HashMap let len: u16 = Readable::read(r)?; let mut ret = HashMap::with_capacity(len as usize); for _ in 0..len { - ret.insert(K::read(r)?, V::read(r)?); + ret.insert(K::read(r)?, V::read(r)?); } Ok(ret) } @@ -197,7 +197,7 @@ impl> Writeable for Vec { .checked_mul(mem::size_of::()) .ok_or(DecodeError::BadLengthDescriptor)?; if byte_size > MAX_BUF_SIZE { - return Err(DecodeError::BadLengthDescriptor); + return Err(DecodeError::BadLengthDescriptor); } (self.len() as u16).write(w)?; // performance with Vec @@ -211,16 +211,16 @@ impl> Writeable for Vec { impl> Readable for Vec { #[inline] fn read(r: &mut Reader) -> Result { - let len: u16 = Readable::read(r)?; - let byte_size = (len as usize) - .checked_mul(mem::size_of::()) - .ok_or(DecodeError::BadLengthDescriptor)?; - if byte_size > MAX_BUF_SIZE { - return Err(DecodeError::BadLengthDescriptor); - } - let mut ret = Vec::with_capacity(len as usize); - for _ in 0..len { ret.push(T::read(r)?); } - Ok(ret) + let len: u16 = Readable::read(r)?; + let byte_size = (len as usize) + .checked_mul(mem::size_of::()) + .ok_or(DecodeError::BadLengthDescriptor)?; + if byte_size > MAX_BUF_SIZE { + return Err(DecodeError::BadLengthDescriptor); + } + let mut ret = Vec::with_capacity(len as usize); + for _ in 0..len { ret.push(T::read(r)?); } + Ok(ret) } }