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 Fixes https://oss-fuzz.com/testcase-detail/5265527465181184 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1912277 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 13, 2023 · 4b70989 · 4b70989
1 parent ca681fd
commit 4b70989
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
@@ -54,8 +54,10 @@ public final class XSSFGraphicFrame extends XSSFShape {
     protected XSSFGraphicFrame(XSSFDrawing drawing, CTGraphicalObjectFrame ctGraphicFrame) {
         this.drawing = drawing; // protected field on XSSFShape
         this.graphicFrame = ctGraphicFrame;
+
         // TODO: there may be a better way to delegate this
-        CTGraphicalObjectData graphicData = graphicFrame.getGraphic().getGraphicData();
+        CTGraphicalObjectData graphicData = graphicFrame.getGraphic() == null ?
+                null : graphicFrame.getGraphic().getGraphicData();
         if (graphicData != null) {
             NodeList nodes = graphicData.getDomNode().getChildNodes();
             for (int i = 0; i < nodes.getLength(); i++) {

diff --git a/test-data/spreadsheet/clusterfuzz-testcase-minimized-POIXSSFFuzzer-5265527465181184.xlsx b/test-data/spreadsheet/clusterfuzz-testcase-minimized-POIXSSFFuzzer-5265527465181184.xlsx