From 4aaec0d72c985e9e920e43da9b9c49235a1cc4b5 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sat, 9 May 2020 15:42:08 -0500 Subject: [PATCH] deserialization: Handle read length of zero from Read --- src/bc/de.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bc/de.rs b/src/bc/de.rs index 4a9ee3b..85a6474 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -1,5 +1,5 @@ use err_derive::Error; -use log::error; +use log::*; use nom::IResult; use nom::{bytes::streaming::take, number::streaming::*, combinator::*, sequence::*}; use std::io::Read; @@ -53,7 +53,10 @@ fn read_from_reader(mut parser: P, mut rdr: R) -> Result Err(e) => return Err(e.into()), }; - (&mut rdr).take(to_read as u64).read_to_end(&mut input)?; + if 0 == (&mut rdr).take(to_read as u64).read_to_end(&mut input)? { + return Err(std::io::Error::new(std::io::ErrorKind::UnexpectedEof, + "Read returned 0 bytes").into()); + } } }