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

Merge pull request #9 from bitonic/master 

Perform sanity check when reading enum variant.
This commit is contained in:
Ty 2015-01-02 20:11:40 -08:00
parent ac6930c37d 38058fb6d3
commit 2447e093a9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/reader.rs
View File

@ -74,10 +74,18 @@ impl<'a, R: Reader+Buffer> Decoder<IoError> for DecoderReader<'a, R> {
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
f(self) f(self)
} }
fn read_enum_variant<T, F>(&mut self, _: &[&str], mut f: F) -> IoResult<T> where fn read_enum_variant<T, F>(&mut self, names: &[&str], mut f: F) -> IoResult<T> where
F: FnMut(&mut DecoderReader<'a, R>, uint) -> IoResult<T> { F: FnMut(&mut DecoderReader<'a, R>, uint) -> IoResult<T> {
let id = try!(self.read_uint()); let id = try!(self.read_uint());
f(self, id) if id >= names.len() {
Err(IoError {
kind: OtherIoError,
desc: "out of bounds tag when reading enum variant",
detail: Some(format!("Expected tag < {}, got {}", names.len(), id))
})
} else {
f(self, id)
}
} }
fn read_enum_variant_arg<T, F>(&mut self, _: uint, f: F) -> IoResult<T> where fn read_enum_variant_arg<T, F>(&mut self, _: uint, f: F) -> IoResult<T> where
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {