(commons-imaging) 03/03: Avoid NullPointerException in TiffImageParser.checkForSubImage(TiffImagingParameters) #304

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git

commit a6a9a9d5c5743fbf0b6af95e6f71c0b3ae6e1624
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Dec 23 11:32:07 2023 -0500

    Avoid NullPointerException in
    TiffImageParser.checkForSubImage(TiffImagingParameters) #304
---
 src/changes/changes.xml                                                | 3 +++
 .../java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f3190321..b6570cf2 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -81,6 +81,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="fix" due-to="Bruno P. Kinoshita, Gary 
Gregory">
         Fail-fast on null inputs in AbstractPixelParser constructor (oss-fuzz 
34180) #183.
       </action>
+      <action dev="ggregory" type="fix" due-to="Luzian Seiler, Ditscheridou, 
Bruno P. Kinoshita, Gary Gregory">
+        Avoid NullPointerException in 
TiffImageParser.checkForSubImage(TiffImagingParameters) #304.
+      </action>
       <!-- ADD -->
       <action issue="IMAGING-352" dev="ggregory" type="add" due-to="Jeroen van 
der Vegt, Gary Gregory">
         [PngWriter] Allow custom PaletteFactory #294.
diff --git 
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java 
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
index d44e1099..b01874b4 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
@@ -84,7 +84,7 @@ public class TiffImageParser extends 
AbstractImageParser<TiffImagingParameters>
         // dimensions of the image that is being read.  This method
         // returns the sub-image specification, if any, and leaves
         // further tests to the calling module.
-        if (params.isSubImageSet()) {
+        if (params != null && params.isSubImageSet()) {
             final int ix0 = params.getSubImageX();
             final int iy0 = params.getSubImageY();
             final int iwidth = params.getSubImageWidth();