aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java6
-rw-r--r--test-data/document/clusterfuzz-testcase-minimized-POIXWPFFuzzer-5564805011079168.docxbin0 -> 34995 bytes
2 files changed, 5 insertions, 1 deletions
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
index 3c70801345..062639d45e 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
@@ -16,6 +16,8 @@
==================================================================== */
package org.apache.poi.xwpf.model;
+import java.math.BigInteger;
+
import org.apache.poi.xwpf.usermodel.XWPFComment;
import org.apache.poi.xwpf.usermodel.XWPFParagraph;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTMarkupRange;
@@ -38,7 +40,9 @@ public class XWPFCommentsDecorator extends XWPFParagraphDecorator {
commentText = new StringBuilder(64);
for (CTMarkupRange anchor : paragraph.getCTP().getCommentRangeStartArray()) {
- if ((comment = paragraph.getDocument().getCommentByID(anchor.getId().toString())) != null) {
+ BigInteger id = anchor.getId();
+ if (id != null &&
+ (comment = paragraph.getDocument().getCommentByID(id.toString())) != null) {
commentText.append("\tComment by ")
.append(comment.getAuthor())
.append(": ")
diff --git a/test-data/document/clusterfuzz-testcase-minimized-POIXWPFFuzzer-5564805011079168.docx b/test-data/document/clusterfuzz-testcase-minimized-POIXWPFFuzzer-5564805011079168.docx
new file mode 100644
index 0000000000..5fad14ce58
--- /dev/null
+++ b/test-data/document/clusterfuzz-testcase-minimized-POIXWPFFuzzer-5564805011079168.docx
Binary files differ