starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-25 08:24:58 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Merge branch 'master' into bufferedsubstream-readbyte

Browse Source
This commit is contained in:
Adam Hathcock
2025-02-17 08:05:02 +00:00
committed by GitHub
parent 441147c0dc 34cd059423
commit 2411f4f870
2 changed files with 95 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/SharpCompress/Compressors/LZMA/LZ/LzOutWindow.cs
View File

@@ -188,6 +188,25 @@ internal class OutWindow
return size;
}
public int ReadByte()
{
if (_streamPos >= _pos)
{
return -1;
}
int value = _buffer[_streamPos];
_streamPos++;
if (_streamPos >= _windowSize)
{
_pos = 0;
_streamPos = 0;
}
return value;
}
public void CopyPending()
{
if (_pendingLen > 0)

76
src/SharpCompress/Compressors/LZMA/LzmaStream.cs
View File

@@ -247,6 +247,82 @@ public class LzmaStream : Stream
return total;
}
public override int ReadByte()
{
if (_endReached)
{
return -1;
}
if (_availableBytes == 0)
{
if (_isLzma2)
{
DecodeChunkHeader();
}
else
{
_endReached = true;
}
}
if (_endReached)
{
if (_inputSize >= 0 && _inputPosition != _inputSize)
{
throw new DataErrorException();
}
if (_outputSize >= 0 && _position != _outputSize)
{
throw new DataErrorException();
}
return -1;
}
_outWindow.SetLimit(1);
if (_uncompressedChunk)
{
_inputPosition += _outWindow.CopyStream(_inputStream, 1);
}
else if (_decoder.Code(_dictionarySize, _outWindow, _rangeDecoder) && _outputSize < 0)
{
_availableBytes = _outWindow.AvailableBytes;
}
var value = _outWindow.ReadByte();
_position++;
_availableBytes--;
if (_availableBytes == 0 && !_uncompressedChunk)
{
// Check range corruption scenario
if (
!_rangeDecoder.IsFinished
|| (_rangeDecoderLimit >= 0 && _rangeDecoder._total != _rangeDecoderLimit)
)
{
// Stream might have End Of Stream marker
_outWindow.SetLimit(2);
if (!_decoder.Code(_dictionarySize, _outWindow, _rangeDecoder))
{
_rangeDecoder.ReleaseStream();
throw new DataErrorException();
}
}
_rangeDecoder.ReleaseStream();
_inputPosition += _rangeDecoder._total;
if (_outWindow.HasPending)
{
throw new DataErrorException();
}
}
return value;
}
private void DecodeChunkHeader()
{
var control = _inputStream.ReadByte();