berkus
/
bincode
mirror of https://git.sr.ht/~stygianentity/bincode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65 from TyOverby/revert-sizechecks 

Revert "Respect size limits in read_seq and read_map."
This commit is contained in:
Ty Overby 2016-04-04 08:01:56 -07:00
parent 8b14cbda92 772b1da6df
commit 01ff0e6209
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/rustc_serialize/reader.rs
View File

@ -345,18 +345,6 @@ impl<'a, R: Read> Decoder for DecoderReader<'a, R> {
where F: FnOnce(&mut DecoderReader<'a, R>, usize) -> DecodingResult<T> where F: FnOnce(&mut DecoderReader<'a, R>, usize) -> DecodingResult<T>
{ {
let len = try!(self.read_usize()); let len = try!(self.read_usize());
match self.size_limit {
SizeLimit::Infinite => (),
SizeLimit::Bounded(x) => {
let overflow = match self.read.checked_add(len as u64) {
Some(y) => y > x,
None => true,
};
if overflow {
return Err(DecodingError::SizeLimit);
}
},
};
f(self, len) f(self, len)
} }
fn read_seq_elt<T, F>(&mut self, _: usize, f: F) -> DecodingResult<T> fn read_seq_elt<T, F>(&mut self, _: usize, f: F) -> DecodingResult<T>
@ -368,18 +356,6 @@ impl<'a, R: Read> Decoder for DecoderReader<'a, R> {
where F: FnOnce(&mut DecoderReader<'a, R>, usize) -> DecodingResult<T> where F: FnOnce(&mut DecoderReader<'a, R>, usize) -> DecodingResult<T>
{ {
let len = try!(self.read_usize()); let len = try!(self.read_usize());
match self.size_limit {
SizeLimit::Infinite => (),
SizeLimit::Bounded(x) => {
let overflow = match self.read.checked_add(len as u64) {
Some(y) => y > x,
None => true,
};
if overflow {
return Err(DecodingError::SizeLimit);
}
},
};
f(self, len) f(self, len)
} }
fn read_map_elt_key<T, F>(&mut self, _: usize, f: F) -> DecodingResult<T> fn read_map_elt_key<T, F>(&mut self, _: usize, f: F) -> DecodingResult<T>