8371501: Change IAE to NPE in java.awt.image.Kernel when data is null #28249
+35
−23
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 is an update to the patch integrated in #28127. It changes the exception from IllegalArgumentException back to NullPointerException, which was thrown previously.
Rationale:
Additional notes:
The patch uses the idiomatic way to check parameters for null via Objects.requireNonNull(). I am not sure whether this code path is performance critical. The use of >> 1 instead of / 2 suggests that performance might matter. If this code is performance sensitive, we can remove the Objects.requireNonNull() call, because even without it the resulting NPE would still clearly show which variable was null when its field was accessed.
It is also possible to remove the use of multiplyExact(). We can simply multiply width/height as long values and compare the result with the data length. In case of overflow, the existing “Data array too small” exception would still be thrown.
Progress
Issue
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/28249/head:pull/28249$ git checkout pull/28249Update a local copy of the PR:
$ git checkout pull/28249$ git pull https://git.openjdk.org/jdk.git pull/28249/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 28249View PR using the GUI difftool:
$ git pr show -t 28249Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/28249.diff
Using Webrev
Link to Webrev Comment