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

Fix breaking changes in GZipStream in .NET 6.

Browse Source
This commit is contained in:
Natalia Portillo
2021-09-15 18:56:50 +01:00
parent 328942471a
commit 71cc849c49
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Aaru.Filters/ForcedSeekStream.cs
View File

@@ -134,16 +134,36 @@ namespace Aaru.Filters
int fullBufferReads = (int)(toPosition / BUFFER_LEN);
int restToRead = (int)(toPosition % BUFFER_LEN);
byte[] buffer;
var bufPos = 0;
var left = BUFFER_LEN;
for(int i = 0; i < fullBufferReads; i++)
{
buffer = new byte[BUFFER_LEN];
_baseStream.Read(buffer, 0, BUFFER_LEN);
bufPos = 0;
left = BUFFER_LEN;
while(left > 0)
{
var done = _baseStream.Read(buffer, bufPos, left);
left -= done;
bufPos += done;
}
_backStream.Write(buffer, 0, BUFFER_LEN);
}
buffer = new byte[restToRead];
_baseStream.Read(buffer, 0, restToRead);
bufPos = 0;
left = restToRead;
while(left > 0)
{
var done = _baseStream.Read(buffer, bufPos, left);
left -= done;
bufPos += done;
}
_backStream.Write(buffer, 0, restToRead);
}
@@ -163,8 +183,9 @@ namespace Aaru.Filters
if(_backStream.Position + count <= _backStream.Length)
return _backStream.Read(buffer, offset, count);
var oldPosition = _backStream.Position;
SetPosition(_backStream.Position + count);
SetPosition(_backStream.Position - count);
SetPosition(oldPosition);
return _backStream.Read(buffer, offset, count);
}