Skip to content

[release/6.0] Fixing a possible null reference error in WebSocket deflate. #62716

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
merged 2 commits into from
Dec 23, 2021
Merged

[release/6.0] Fixing a possible null reference error in WebSocket deflate. #62716

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62a964b
Fixing a possible null reference error in websocket deflate functiona…
zlatanov Dec 6, 2021
0d86188
Style feedback.
zlatanov Dec 6, 2021
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
9 changes: 8 additions & 1 deletion ...ibraries/System.Net.WebSockets/src/System/Net/WebSockets/Compression/WebSocketDeflater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,21 @@ private unsafe void UnsafeDeflate(ReadOnlySpan<byte> input, Span<byte> output, o
consumed = input.Length - (int)_stream.AvailIn;
written = output.Length - (int)_stream.AvailOut;

needsMoreBuffer = errorCode == ErrorCode.BufError || _stream.AvailIn > 0;
// It is important here to also check that we haven't
// exhausted the output buffer because after deflating we're
// always going to issue a flush and a flush with empty output
// is going to throw.
needsMoreBuffer = errorCode == ErrorCode.BufError
|| _stream.AvailIn > 0
|| written == output.Length;
}
}

private unsafe int UnsafeFlush(Span<byte> output, out bool needsMoreBuffer)
{
Debug.Assert(_stream is not null);
Debug.Assert(_stream.AvailIn == 0);
Debug.Assert(output.Length > 0);

fixed (byte* fixedOutput = output)
{
Expand Down