Issue #12818 - fix potential NPE from WebSocketConnection #13264
+244
−11
Conversation
This file contains hidden or 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
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
sbordet
previously approved these changes
Jun 24, 2025
| @@ -429,6 +464,28 @@ public void cancelDemand() | |||
|
|
|||
| private void fillAndParse() | |||
| { | |||
| boolean doClose = false; | |||
There was a problem hiding this comment.
Rename to just close like above.
gregw
previously approved these changes
Jun 25, 2025
...ebsocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConnection.java
Show resolved
Hide resolved
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
gregw
previously approved these changes
Jun 25, 2025
...ebsocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConnection.java
Outdated
Show resolved
Hide resolved
…n/java/org/eclipse/jetty/websocket/core/WebSocketConnection.java Co-authored-by: Greg Wilkins <gregw@webtide.com>
gregw
approved these changes
Jun 25, 2025
sbordet
approved these changes
Jun 25, 2025
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.
Fixes #12818 and #13225
If a close
WebSocketConnection.onCloseevent happens duringfillAndParse()then the network buffer is nulled out while it is still in use potentially causing NPE.This fixes this issue by introducing a new atomic state so that onClosed() serializes the close actions with
fillAndParse().