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 Should fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=62151 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1912198 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 8, 2023 · f90415e · f90415e
1 parent e686e84
commit f90415e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTable.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTable.java
@@ -114,7 +114,7 @@ public CTTable getCTTable(){
 
     @Override
     public int getNumberOfColumns() {
-        return _table.getTblGrid().sizeOfGridColArray();
+        return _table.getTblGrid() == null ? 0 : _table.getTblGrid().sizeOfGridColArray();
     }
 
     @Override

diff --git a/test-data/slideshow/clusterfuzz-testcase-minimized-POIXSLFFuzzer-6254434927378432.pptx b/test-data/slideshow/clusterfuzz-testcase-minimized-POIXSLFFuzzer-6254434927378432.pptx
diff --git a/test-data/spreadsheet/stress.xls b/test-data/spreadsheet/stress.xls