WebSocket: fix bad assert, unstick shutdown #10366
Closed
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
Reported-by: Stanley Wucw Fixes #10347
As this mode uses blocking sockets, it must set them back to non-blocking in disconnect to avoid the risk of getting stuck.
bagder
added a commit
that referenced
this pull request
Jan 30, 2023
As this mode uses blocking sockets, it must set them back to non-blocking in disconnect to avoid the risk of getting stuck. Closes #10366
dfandrich
reviewed
Jan 30, 2023
| @@ -479,7 +479,6 @@ CURL_EXTERN CURLcode curl_ws_recv(struct Curl_easy *data, void *buffer, | |||
|
|
|||
| /* update buffer and frame info */ | |||
| wsp->frame.offset += datalen; | |||
| DEBUGASSERT(wsp->frame.bytesleft >= (curl_off_t)datalen); | |||
There was a problem hiding this comment.
I don't think this assert is bad by itself, as long as the following two lines is there. The assert protects bytesleft from ever going negative in the subtraction two lines down. With the assert gone, it's possible for bytesleft to go negative which I don't think is the intention but shows that the assumptions are wrong somewhere else.
There was a problem hiding this comment.
For this reproducer case, bytelength was zero at this point, so the assert() was clearly not doing a good job at that position at least. But sure, maybe it would work better in the conditional block just before the subtraction is done.
We can always add more asserts when we go about and continue to debug this functionality.
bch
pushed a commit
to bch/curl
that referenced
this pull request
Jul 19, 2023
Reported-by: Stanley Wucw Fixes curl#10347 Closes curl#10366
bch
pushed a commit
to bch/curl
that referenced
this pull request
Jul 19, 2023
As this mode uses blocking sockets, it must set them back to non-blocking in disconnect to avoid the risk of getting stuck. Closes curl#10366
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.
No description provided.