Skip to content

Fix empty buffer handling in TlsHandler #80

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
maksimkim wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix empty buffer handling in TlsHandler #80

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53097b2
translate empty incoming buffer to empty outgoing buffer
maksimkim Sep 20, 2021
b2218f1
remove duplicate readbyte
maksimkim May 20, 2022
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
11 changes: 10 additions & 1 deletion src/DotNetty.Handlers/Tls/TlsHandler.Writer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ namespace DotNetty.Handlers.Tls

partial class TlsHandler
{
static readonly byte[] ZeroBuf = new byte[0];

private IPromise _lastContextWritePromise;
private volatile int v_wrapDataSize = TlsUtils.MAX_PLAINTEXT_LENGTH;

Expand Down Expand Up @@ -168,7 +170,14 @@ private void Wrap(IChannelHandlerContext context)
composite.Release();
}
_lastContextWritePromise = promise;
_ = buf.ReadBytes(_sslStream, readableBytes); // this leads to FinishWrap being called 0+ times
if (buf.IsReadable())
{
_ = buf.ReadBytes(_sslStream, readableBytes); // this leads to FinishWrap being called 0+ times
}
else if (promise != null)
{
FinishWrap(ZeroBuf, 0, 0, promise);
}
}
catch (Exception exc)
{
Expand Down