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

Workaround for rustc hiccup in `for` loop restructuring, remove assert from deserialization code 

Thanks to the assert change there is a segfault happening :(
This commit is contained in:
Andrew Poelstra 2014-07-25 15:52:48 -07:00
parent 128ebcc6d5
commit cc942a47f3
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/serialize.rs
View File

@ -457,7 +457,13 @@ impl<T: Serializable> Serializable for ThinVec<T> {
fn deserialize<I: Iterator<u8>>(mut iter: I) -> IoResult<ThinVec<T>> { fn deserialize<I: Iterator<u8>>(mut iter: I) -> IoResult<ThinVec<T>> {
let n_elems = varint_to_u64(try!(Serializable::deserialize(iter.by_ref()))); let n_elems = varint_to_u64(try!(Serializable::deserialize(iter.by_ref())));
assert!(n_elems < u32::MAX as u64); if n_elems >= u32::MAX as u64 {
return Err(IoError {
kind: InvalidInput,
desc: "vector length too large",
detail: Some(format!("tried to read ThinVec with len {} > 4bn", n_elems))
});
}
let mut v: ThinVec<T> = ThinVec::with_capacity(n_elems as u32); let mut v: ThinVec<T> = ThinVec::with_capacity(n_elems as u32);
for i in range(0, n_elems) { for i in range(0, n_elems) {

14
src/util/patricia_tree.rs
View File

@ -415,7 +415,7 @@ impl<T:Serializable+'static, K:BitArray+Serializable+'static> Serializable for P
fn deserialize<I: Iterator<u8>>(mut iter: I) -> IoResult<PatriciaTree<T, K>> { fn deserialize<I: Iterator<u8>>(mut iter: I) -> IoResult<PatriciaTree<T, K>> {
// This goofy deserialization routine is to prevent an infinite // This goofy deserialization routine is to prevent an infinite
// regress of ByRef<ByRef<...<ByRef<I>>...>>, see #15188 // regress of ByRef<ByRef<...<ByRef<I>>...>>, see #15188
fn recurse<T:Serializable, K:Serializable, I: Iterator<u8>>(iter: &mut ByRef<I>) -> IoResult<PatriciaTree<T, K>> { fn recurse<T:Serializable+'static, K:Serializable, I: Iterator<u8>>(iter: &mut ByRef<I>) -> IoResult<PatriciaTree<T, K>> {
Ok(PatriciaTree { Ok(PatriciaTree {
skip_prefix: try!(prepend_err("skip_prefix", Serializable::deserialize(iter.by_ref()))), skip_prefix: try!(prepend_err("skip_prefix", Serializable::deserialize(iter.by_ref()))),
skip_len: try!(prepend_err("skip_len", Serializable::deserialize(iter.by_ref()))), skip_len: try!(prepend_err("skip_len", Serializable::deserialize(iter.by_ref()))),
@ -658,9 +658,9 @@ mod tests {
} }
// Iterate over and try to get everything // Iterate over and try to get everything
for &n in tree.iter() { for n in tree.iter() {
assert!(data[n].is_some()); assert!(data[*n].is_some());
*data.get_mut(n) = None; *data.get_mut(*n) = None;
} }
// Check that we got everything // Check that we got everything
@ -685,9 +685,9 @@ mod tests {
} }
// Iterate over and try to get everything // Iterate over and try to get everything
for &n in tree.mut_iter() { for n in tree.mut_iter() {
assert!(data[n].is_some()); assert!(data[*n].is_some());
*data.get_mut(n) = None; *data.get_mut(*n) = None;
} }
// Check that we got everything // Check that we got everything