summaryrefslogtreecommitdiffstats
path: root/buffered-reader
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2018-10-02 23:13:03 +0200
committerNeal H. Walfield <neal@pep.foundation>2018-10-02 23:13:03 +0200
commit6788e434dc1278261d1b16825540b612cdd6a59a (patch)
treee5a8a2ea2b689fbd1cdc69783602c6f4d1e9f859 /buffered-reader
parent1114a77ff28c1a6552b038262c2b090614bb0746 (diff)
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.
Diffstat (limited to 'buffered-reader')
-rw-r--r--buffered-reader/src/generic.rs6
1 files changed, 5 insertions, 1 deletions
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<T: io::Read, C> BufferedReaderGeneric<T, C> {
}
},
None if self.saw_eof => {
- return Ok(&b""[..]);
+ if hard && amount > 0 {
+ Err(Error::new(ErrorKind::UnexpectedEof, "EOF"))
+ } else {
+ Ok(&b""[..])
+ }
},
None => {
unreachable!();