Check EngineHelper for null in SSLSocket.close()#283
Merged
rlm2002 merged 1 commit intowolfSSL:masterfrom Jul 31, 2025
Merged
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR addresses a potential null pointer exception in the WolfSSLSocket.close() method by adding null checks for the EngineHelper field before accessing it. The fix prevents NPEs that could occur if EngineHelper was already set to null or if the constructor failed after partial initialization.
- Added null pointer checks around
EngineHelpermethod calls inclose()andcheckAndInitSSLSocket() - Added a regression test that simulates the scenario using reflection to set
EngineHelperto null
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/java/com/wolfssl/provider/jsse/WolfSSLSocket.java | Added null checks for EngineHelper in close() and checkAndInitSSLSocket() methods |
| src/test/com/wolfssl/provider/jsse/test/WolfSSLSocketTest.java | Added regression test to verify close() handles null EngineHelper without throwing NPE |
d8a811d to
2289eed
Compare
rlm2002
approved these changes
Jul 31, 2025
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
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.
This PR adds null pointer checking to
WolfSSLSocket, specifically for the issue inclose()wherethis.EngineHelper.clearObjectState();could have been called in some scenarios ifthis.EngineHelperhad already been set to null.A regression test has also been added as part of this PR.