Skip to content

fix: Ensure buffer space before reading in Decompress method #127105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rzikm merged 9 commits into from
Apr 20, 2026
+4 −0
Merged

fix: Ensure buffer space before reading in Decompress method #127105

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bfb4eb3
Ensure buffer space before reading in Decompress method
pumpkin-bit Apr 18, 2026
693d56c
style: remove trailing whitespaces
pumpkin-bit Apr 18, 2026
516c178
Update src/libraries/System.IO.Compression/src/System/IO/Compression/…
pumpkin-bit Apr 18, 2026
073b18e
Update src/libraries/System.IO.Compression/src/System/IO/Compression/…
pumpkin-bit Apr 18, 2026
7351c32
add: unit test for ZstandardStream boundary condition
pumpkin-bit Apr 18, 2026
87bdf4e
add: system.threading for async support in tests
pumpkin-bit Apr 18, 2026
595f9bb
Delete src/libraries/System.IO.Compression/tests/Zstandard/Compressio…
pumpkin-bit Apr 20, 2026
c18529b
recovery CompressionStreamUnitTests.Zstandard.cs
pumpkin-bit Apr 20, 2026
bb339c2
Remove ZstandardStream boundary truncation test
pumpkin-bit Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...s/System.IO.Compression/src/System/IO/Compression/Zstandard/ZstandardStream.Decompress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ public override int Read(Span<byte> buffer)
OperationStatus lastResult;
while (!TryDecompress(buffer, out bytesWritten, out lastResult))
{
_buffer.EnsureAvailableSpace(1);

int bytesRead = _stream.Read(_buffer.AvailableSpan);
if (bytesRead <= 0)
{
Expand Down Expand Up @@ -192,6 +194,8 @@ public override async ValueTask<int> ReadAsync(Memory<byte> buffer, Cancellation
OperationStatus lastResult;
while (!TryDecompress(buffer.Span, out bytesWritten, out lastResult))
{
_buffer.EnsureAvailableSpace(1);

int bytesRead = await _stream.ReadAsync(_buffer.AvailableMemory, cancellationToken).ConfigureAwait(false);
if (bytesRead <= 0)
{
Expand Down
Loading