diff options
author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2021-11-15 17:27:15 +0100 |
---|---|---|
committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2021-11-15 17:27:15 +0100 |
commit | 52f954a3961a683e1b317c63067063082501ce3d (patch) | |
tree | abdf54d242336208f2ed0e5c2817a11ba99fea63 | |
parent | f27c73df2e609d8d96790333d8aad65ddd6f0df4 (diff) | |
download | nihav-52f954a3961a683e1b317c63067063082501ce3d.tar.gz |
core/byteio: check for end boundary in BoundedFileReader reads
-rw-r--r-- | nihav-core/src/io/byteio.rs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/nihav-core/src/io/byteio.rs b/nihav-core/src/io/byteio.rs index b3d0621..2bac190 100644 --- a/nihav-core/src/io/byteio.rs +++ b/nihav-core/src/io/byteio.rs @@ -717,6 +717,12 @@ impl<T: Read+Seek> ByteIO for BoundedFileReader<T> { } fn read_buf(&mut self, buf: &mut [u8]) -> ByteIOResult<usize> { + if let Some(epos) = self.end { + if self.real_tell() >= epos { + self.eof = true; + return Err(ByteIOError::EOF); + } + } let len = self.max_read_len(buf.len()); match self.file.read_exact(&mut buf[..len]) { Ok(()) if len == buf.len() => Ok(buf.len()), @@ -736,6 +742,12 @@ impl<T: Read+Seek> ByteIO for BoundedFileReader<T> { } fn read_buf_some(&mut self, buf: &mut [u8]) -> ByteIOResult<usize> { + if let Some(epos) = self.end { + if self.real_tell() >= epos { + self.eof = true; + return Err(ByteIOError::EOF); + } + } let len = self.max_read_len(buf.len()); let ret = self.file.read(&mut buf[..len]); if ret.is_err() { return Err(ByteIOError::ReadError); } @@ -743,6 +755,9 @@ impl<T: Read+Seek> ByteIO for BoundedFileReader<T> { if sz < len { if let Err(_err) = self.file.read(&mut buf[sz..][..1]) { self.eof = true; + if sz == 0 { + return Err(ByteIOError::EOF); + } } else { return Ok(sz + 1); } |