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@1912138 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 6, 2023 · 24bf8c3 · 24bf8c3
1 parent b801711
commit 24bf8c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
@@ -78,11 +78,12 @@ public XWPFParagraph(CTP prgrph, IBody part) {
                     XmlObject o = c.getObject();
                     if (o instanceof CTFtnEdnRef) {
                         CTFtnEdnRef ftn = (CTFtnEdnRef) o;
-                        footnoteText.append(" [").append(ftn.getId()).append(": ");
+                        final BigInteger id = ftn.getId();
+                        footnoteText.append(" [").append(id).append(": ");
                         XWPFAbstractFootnoteEndnote footnote =
                                 ftn.getDomNode().getLocalName().equals("footnoteReference") ?
-                                        document.getFootnoteByID(ftn.getId().intValue()) :
-                                        document.getEndnoteByID(ftn.getId().intValue());
+                                        document.getFootnoteByID(id == null ? 0 : id.intValue()) :
+                                        document.getEndnoteByID(id == null ? 0 : id.intValue());
                         if (null != footnote) {
                             boolean first = true;
                             for (XWPFParagraph p : footnote.getParagraphs()) {
@@ -93,7 +94,7 @@ public XWPFParagraph(CTP prgrph, IBody part) {
                                 footnoteText.append(p.getText());
                             }
                         } else {
-                            footnoteText.append("!!! End note with ID \"").append(ftn.getId()).append("\" not found in document.");
+                            footnoteText.append("!!! End note with ID \"").append(id).append("\" not found in document.");
                         }
                         footnoteText.append("] ");
 

diff --git a/test-data/document/clusterfuzz-testcase-minimized-POIXWPFFuzzer-6061520554164224.docx b/test-data/document/clusterfuzz-testcase-minimized-POIXWPFFuzzer-6061520554164224.docx
diff --git a/test-data/spreadsheet/stress.xls b/test-data/spreadsheet/stress.xls