From 6788e434dc1278261d1b16825540b612cdd6a59a Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Tue, 2 Oct 2018 23:13:03 +0200 Subject: buffered-reader: Fix BufferedReaderGeneric::data_hard. - Calling BufferedReaderGeneric::data_hard with amount greater than 0 on an empty file should return an error, not an empty buffer. --- buffered-reader/src/generic.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/buffered-reader/src/generic.rs b/buffered-reader/src/generic.rs index b6fe7aa2..ed187eff 100644 --- a/buffered-reader/src/generic.rs +++ b/buffered-reader/src/generic.rs @@ -177,7 +177,11 @@ impl BufferedReaderGeneric { } }, None if self.saw_eof => { - return Ok(&b""[..]); + if hard && amount > 0 { + Err(Error::new(ErrorKind::UnexpectedEof, "EOF")) + } else { + Ok(&b""[..]) + } }, None => { unreachable!(); -- cgit v1.2.3