Bug 66425: Avoid a ClassCastException found via oss-fuzz

We try to avoid throwing ClassCastException, but it was possible to trigger one here with a specially crafted input-file Fixes https://oss-fuzz.com/testcase-detail/4959857092198400 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1912157 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 7, 2023 · 5c2a894 · 5c2a894
1 parent 40cdc76
commit 5c2a894
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
@@ -71,11 +71,11 @@ protected XWPFHeaderFooter() {
      */
     public XWPFHeaderFooter(POIXMLDocumentPart parent, PackagePart part) {
         super(parent, part);
-        this.document = (XWPFDocument) getParent();
-
-        if (this.document == null) {
-            throw new NullPointerException();
+        final POIXMLDocumentPart p = getParent();
+        if (!(p instanceof XWPFDocument)) {
+            throw new IllegalArgumentException("Had unexpected type of parent: " + (p == null ? "<null>" : p.getClass()));
         }
+        this.document = (XWPFDocument) p;
     }
 
     @Override

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
@@ -271,4 +271,12 @@ public static XWPFRelation getInstance(String rel) {
         return _table.get(rel);
     }
 
+    @Override
+    public String toString() {
+        return "XWPFRelation{" +
+                //getRelation() + "/" +
+                getContentType() + "/" +
+                getDefaultFileName() +
+                "}";
+    }
 }
diff --git a/test-data/document/clusterfuzz-testcase-minimized-POIXWPFFuzzer-4959857092198400.docx b/test-data/document/clusterfuzz-testcase-minimized-POIXWPFFuzzer-4959857092198400.docx
diff --git a/test-data/spreadsheet/stress.xls b/test-data/spreadsheet/stress.xls