Avoid trying to throw an exception if one is pending #44
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
A call to to_SSL will throw a NullPointerException if the SSL object reference is null. Avoid trying to throw our own exception if that's the case. Also rearrange calls that might potentially throw to be serially checked.
nmittler
reviewed
Jan 13, 2017
| if (x509 == nullptr) { | ||
| Errors::jniThrowNullPointerException(env, "x509 == null"); | ||
| JNI_TRACE("X509_verify(%p, %p) => x509 == null", x509, pkey); | ||
| if (pkey == nullptr) { |
There was a problem hiding this comment.
Not sure I totally follow why you've switched the order of these checks ... can you elaborate?
There was a problem hiding this comment.
If fromContextObject call gets a nullptr for pkey it will push a NullPointerException and at that point the JNI exception will be pending. If x509 is also nullptr the previous line 3902 will try to throw another exception when one is already pending which is a JNI error.
Normally this won't be a problem on production builds, but it aborts in debug Android builds or when checkJni is enabled.
There was a problem hiding this comment.
I see ... sgtm. Thanks for the explanation.
nmittler
approved these changes
Jan 13, 2017
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.
A call to to_SSL or fromContextObject will throw a NullPointerException
if the SSL object reference is null. Avoid trying to throw our own
exception if that's the case. Also rearrange calls that might potentially
throw to be serially checked.