-
Notifications
You must be signed in to change notification settings - Fork 5.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
JDK-8293093 NPE in P11KeyStore.getID #10823
Conversation
👋 Welcome back mpowers! A progress list of the required criteria for merging this PR into |
I was finally able to reproduce this failure and was able to verify the fix. Took forever. |
Webrevs
|
Given the repeated code wouldn't you want to create a small helper method like |
There are some other places, for example in updatePkey(), that use cka_id. Did you have a chance to check if NPE is possible there as well? |
Looking at the usage of getID(), it seems like debug msgs and exceptions are where the null maybe a problem. mapLabel() checks for null. It maybe best to change getID(bytes[]) to return new String("null") then having if() checks for the return value. |
You should add a |
@efge Good suggestion. And having @XueleiFan Regarding @ascarpino Agreed. @seanjmullan |
@mcpowers
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good
@mcpowers This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 44 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@ascarpino, @XueleiFan) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
Thanks Tony! |
@mcpowers Did you want to update line line 203-207 as well? It might be safe to remove the current getID(byte[]) method. If the parameter is null, there is an NPE (unexpected); otherwise, the new method should be safe to use. |
@XueleiFan Lines 204 and 206 can't be collapsed into a single call to getIDNullSafe because of square brackets in the output on line 204. I don't want to change existing output in any way. Perhaps I'm not understanding your question. |
I just feel that it may be not necessary to maintain both getID() and getIDNullSafe(). But no problem if you want to keep the square brackets for toString(). |
@XueleiFan Thanks for reviewing this! |
/integrate |
/sponsor |
Going to push as commit 8e5d680.
Your commit was automatically rebased without conflicts. |
@ascarpino @mcpowers Pushed as commit 8e5d680. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
https://bugs.openjdk.org/browse/JDK-8293093
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10823/head:pull/10823
$ git checkout pull/10823
Update a local copy of the PR:
$ git checkout pull/10823
$ git pull https://git.openjdk.org/jdk pull/10823/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 10823
View PR using the GUI difftool:
$ git pr show -t 10823
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10823.diff