diff --git a/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java b/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java index 1b1480caa6..7579f8a9f8 100644 --- a/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java +++ b/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java @@ -364,6 +364,10 @@ public class SlideShowExtractor< // PowerPoint seems to store files with \r as the line break // The messes things up on everything but a Mac, so translate them to \n String txt = tr.getRawText(); + if (txt == null) { + return ""; + } + txt = txt.replace('\r', '\n'); txt = txt.replace((char) 0x0B, sep); diff --git a/test-data/slideshow/clusterfuzz-testcase-minimized-POIXSLFFuzzer-4986044400861184.pptx b/test-data/slideshow/clusterfuzz-testcase-minimized-POIXSLFFuzzer-4986044400861184.pptx new file mode 100644 index 0000000000..df4a713ff0 Binary files /dev/null and b/test-data/slideshow/clusterfuzz-testcase-minimized-POIXSLFFuzzer-4986044400861184.pptx differ diff --git a/test-data/spreadsheet/stress.xls b/test-data/spreadsheet/stress.xls index b715df6bdc..24d91b2661 100644 Binary files a/test-data/spreadsheet/stress.xls and b/test-data/spreadsheet/stress.xls differ