From 5cc8b9958cbe1d1ca0fc378eb10e3123ed71e4ad Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Fri, 27 Oct 2023 10:07:57 +0000 Subject: [PATCH] Bug 66425: Avoid exceptions found via poi-fuzz Fix one expected exception-text which is different on newer Java versions Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=63266 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1913383 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/xssf/usermodel/XSSFTextParagraph.java | 2 +- ...minimized-POIXSSFFuzzer-6419366255919104.xlsx | Bin 0 -> 8420 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 test-data/spreadsheet/clusterfuzz-testcase-minimized-POIXSSFFuzzer-6419366255919104.xlsx diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java index f93c644744..55e52db3d8 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java @@ -836,7 +836,7 @@ public class XSSFTextParagraph implements Iterable{ public ListAutoNumber getBulletAutoNumberScheme() { ParagraphPropertyFetcher fetcher = new ParagraphPropertyFetcher(getLevel()){ public boolean fetch(CTTextParagraphProperties props){ - if(props.isSetBuAutoNum()) { + if(props.isSetBuAutoNum() && props.getBuAutoNum().getType() != null) { setValue(ListAutoNumber.values()[props.getBuAutoNum().getType().intValue() - 1]); return true; } diff --git a/test-data/spreadsheet/clusterfuzz-testcase-minimized-POIXSSFFuzzer-6419366255919104.xlsx b/test-data/spreadsheet/clusterfuzz-testcase-minimized-POIXSSFFuzzer-6419366255919104.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..2a3a0d7d648b5f0f1a06c740b8ba434926c04648 GIT binary patch literal 8420 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 HfsX$HKS_6C literal 0 HcmV?d00001 -- 2.39.5