Skip to content

[release/10.0] Don't flush data in DeflateStream.FlushAsync if no data was written #121796

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

Open
wants to merge 1 commit into
base: release/10.0
Choose a base branch
from
+16 −13
Open

[release/10.0] Don't flush data in DeflateStream.FlushAsync if no data was written #121796

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 16 additions & 13 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateZLib/DeflateStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,21 +220,24 @@ async Task Core(CancellationToken cancellationToken)
{
Debug.Assert(_deflater != null && _buffer != null);

// Compress any bytes left:
await WriteDeflaterOutputAsync(cancellationToken).ConfigureAwait(false);

// Pull out any bytes left inside deflater:
bool flushSuccessful;
do
if (_wroteBytes)
{
int compressedBytes;
flushSuccessful = _deflater.Flush(_buffer, out compressedBytes);
if (flushSuccessful)
// Compress any bytes left:
await WriteDeflaterOutputAsync(cancellationToken).ConfigureAwait(false);

// Pull out any bytes left inside deflater:
bool flushSuccessful;
do
{
await _stream.WriteAsync(new ReadOnlyMemory<byte>(_buffer, 0, compressedBytes), cancellationToken).ConfigureAwait(false);
}
Debug.Assert(flushSuccessful == (compressedBytes > 0));
} while (flushSuccessful);
int compressedBytes;
flushSuccessful = _deflater.Flush(_buffer, out compressedBytes);
if (flushSuccessful)
{
await _stream.WriteAsync(new ReadOnlyMemory<byte>(_buffer, 0, compressedBytes), cancellationToken).ConfigureAwait(false);
}
Debug.Assert(flushSuccessful == (compressedBytes > 0));
} while (flushSuccessful);
}

// Always flush on the underlying stream
await _stream.FlushAsync(cancellationToken).ConfigureAwait(false);
Expand Down
Loading