starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-11-15 17:02:03 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Merge pull request #1481 from adamhathcock/adam/lzma2-invalid-props

Browse Source 
Report invalid LZMA2 chunk properties as a data error
This commit is contained in:
Adam Hathcock
2026-10-27 15:32:27 +00:00
committed by GitHub
parent 51c00c62d8 c4028139fd
commit dedbf6ac57
3 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/SharpCompress/Compressors/LZMA/LzmaStream.Async.cs
View File

@@ -146,11 +146,8 @@ public partial class LzmaStream
await _inputStream!
.ReadExactAsync(headerBuffer, 0, 1, cancellationToken)
.ConfigureAwait(false);
Properties[0] = headerBuffer[0];
_inputPosition++;
_decoder ??= new Decoder();
_decoder.SetDecoderProperties(Properties);
SetChunkProperties(headerBuffer[0]);
}
else if (_needProps)
{

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

@@ -547,6 +547,21 @@ public partial class LzmaStream : Stream, IStreamStack, IAsyncDisposable
return value;
}
private void SetChunkProperties(byte properties)
{
// A properties byte encodes (pb * 5 + lp) * 9 + lc with pb <= 4; a larger value is
// corrupt stream data, not an invalid caller argument.
if (properties >= 9 * 5 * 5)
{
throw new DataErrorException();
}
Properties[0] = properties;
// Properties initialization resets every probability and match-state field.
_decoder ??= new Decoder();
_decoder.SetDecoderProperties(Properties);
}
private void DecodeChunkHeader()
{
var control = ReadChunkHeaderByte();
@@ -585,11 +600,7 @@ public partial class LzmaStream : Stream, IStreamStack, IAsyncDisposable
if (control >= 0xC0)
{
_needProps = false;
Properties[0] = (byte)ReadChunkHeaderByte();
// Properties initialization resets every probability and match-state field.
_decoder ??= new Decoder();
_decoder.SetDecoderProperties(Properties);
SetChunkProperties((byte)ReadChunkHeaderByte());
}
else if (_needProps)
{

28
tests/SharpCompress.Test/Streams/LzmaDecoderSafetyTests.cs
View File

@@ -78,6 +78,34 @@ public class LzmaDecoderSafetyTests
});
}
// LZMA2 chunk with dictionary and properties reset whose properties byte encodes pb > 4.
private static readonly byte[] InvalidChunkProperties = { 0xE0, 0, 0, 0, 4, 0xFF, 0, 0, 0, 0 };
[Fact]
public void Lzma2InvalidChunkPropertiesThrowsDataError()
{
using var input = new MemoryStream(InvalidChunkProperties);
using var stream = LzmaStream.Create(new byte[] { 0 }, input, leaveOpen: true);
Assert.Throws<DataErrorException>(() => stream.ReadByte());
}
[Fact]
public async Task AsyncLzma2InvalidChunkPropertiesThrowsDataError()
{
using var input = new MemoryStream(InvalidChunkProperties);
using var stream = await LzmaStream.CreateAsync(
new byte[] { 0 },
input,
-1,
-1,
leaveOpen: true
);
var buffer = new byte[16];
await Assert.ThrowsAsync<DataErrorException>(() =>
stream.ReadAsync(buffer, 0, buffer.Length, CancellationToken.None)
);
}
#if !LEGACY_DOTNET
[Theory]
[InlineData(false)]