aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disallow ForcedSeekStream to go beyond file end. Fixes #556

Browse Source
This commit is contained in:
Natalia Portillo
2021-07-16 13:02:36 +01:00
parent e0553555ae
commit d5a43f6cc5
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Aaru.Filters/ForcedSeekStream.cs
View File

@@ -118,6 +118,9 @@ namespace Aaru.Filters
return;
}
if(position > _streamLength)
position = _streamLength;
_backStream.Position = _backStream.Length;
long toPosition = position - _backStream.Position;
int fullBufferReads = (int)(toPosition / BUFFER_LEN);
@@ -144,6 +147,9 @@ namespace Aaru.Filters
public override int Read(byte[] buffer, int offset, int count)
{
if(_backStream.Position + count > _streamLength)
count = (int)(_streamLength - _backStream.Position);
if(_backStream.Position + count <= _backStream.Length)
return _backStream.Read(buffer, offset, count);
@@ -155,6 +161,9 @@ namespace Aaru.Filters
public override int ReadByte()
{
if(_backStream.Position + 1 > _streamLength)
return -1;
if(_backStream.Position + 1 <= _backStream.Length)
return _backStream.ReadByte();