Bug 66425: Avoid a NullPointerException found via oss-fuzz

We try to avoid throwing NullPointerException, but it was possible to trigger one here with a specially crafted input-file git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1912139 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 6, 2023 · 5d073e3 · 5d073e3
1 parent 24bf8c3
commit 5d073e3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLRelation.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLRelation.java
@@ -205,6 +205,9 @@ public InputStream getContents(PackagePart corePart) throws IOException, Invalid
             PackageRelationship rel = it.next();
             PackagePartName relName = PackagingURIHelper.createPartName(rel.getTargetURI());
             PackagePart part = corePart.getPackage().getPart(relName);
+            if (part == null) {
+                throw new IllegalArgumentException("Could not read part " + relName + " from " + corePart);
+            }
             return part.getInputStream();
         }
         LOGGER.atWarn().log("No part {} found", getDefaultFileName());

diff --git a/test-data/spreadsheet/clusterfuzz-testcase-minimized-POIXSSFFuzzer-6448258963341312.xlsx b/test-data/spreadsheet/clusterfuzz-testcase-minimized-POIXSSFFuzzer-6448258963341312.xlsx
diff --git a/test-data/spreadsheet/stress.xls b/test-data/spreadsheet/stress.xls