fix(Net) bad mask with odd number of bytes #4838
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Receiving an odd number of bytes in non-blocking mode results in using the wrong bytes to unmask the payload. Keep track of the number of payload bytes that have been unmasked.
|
I'm definitely open to suggestions on how to unit test this... Ideally, I'd have a test that sends in the payload of a frame one byte at a time (setting TCP_NODELAY so each byte wakes up the receiving end). |
|
I would take |
austin-beer
reviewed
Jan 8, 2025
| @@ -297,7 +297,7 @@ int WebSocketImpl::receiveBytes(void* buffer, int length, int) | |||
|
|
|||
| skipHeader(_receiveState.headerLength); | |||
|
|
|||
| if (receivePayload(reinterpret_cast<char*>(buffer), payloadLength, _receiveState.mask, _receiveState.useMask) != payloadLength) | |||
| if (receivePayload(reinterpret_cast<char*>(buffer), payloadLength, _receiveState.mask, _receiveState.useMask, 0) != payloadLength) | |||
There was a problem hiding this comment.
For consistency I would pass in _receiveState.maskOffset here as well instead of 0.
matejk
pushed a commit
that referenced
this pull request
Jan 14, 2025
…t_mask fix(Net) bad mask with odd number of bytes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Receiving an odd number of bytes in non-blocking mode results in using the wrong bytes to unmask the payload. Keep track of the number of payload bytes that have been unmasked.