diff options
| author | Dominik Stadler <centic@apache.org> | 2023-12-30 11:11:42 +0000 |
|---|---|---|
| committer | Dominik Stadler <centic@apache.org> | 2023-12-30 11:11:42 +0000 |
| commit | 8507fdf3714a9ab9ab83de1293a0015975d370e3 (patch) | |
| tree | a489bc56645611dea8ca5ef10e2d06a043f056ee /poi | |
| parent | 28811d26dfd4aab9560683ace083f61ce1834b63 (diff) | |
| download | poi-8507fdf3714a9ab9ab83de1293a0015975d370e3.tar.gz poi-8507fdf3714a9ab9ab83de1293a0015975d370e3.zip | |
Bug 66425: Avoid exceptions found via poi-fuzz
Prevent ClassCastException
Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=63504
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1914991 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poi')
3 files changed, 9 insertions, 2 deletions
diff --git a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java index 080938367b..0dc114ac67 100644 --- a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java +++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java @@ -57,7 +57,11 @@ public class HSSFShapeFactory { } EscherClientDataRecord clientData = ((EscherContainerRecord) child).getChildById(EscherClientDataRecord.RECORD_ID); if (null != clientData) { - obj = (ObjRecord) agg.getShapeToObjMapping().get(clientData); + Record record = agg.getShapeToObjMapping().get(clientData); + if (!(record instanceof ObjRecord)) { + throw new IllegalArgumentException("Had unexpected type of clientData: " + (record == null ? "<null>" : record.getClass())); + } + obj = (ObjRecord) record; } HSSFShapeGroup group = new HSSFShapeGroup(container, obj); List<EscherContainerRecord> children = container.getChildContainers(); diff --git a/poi/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java b/poi/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java index b9abe815f4..f7af364978 100644 --- a/poi/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java +++ b/poi/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java @@ -57,6 +57,7 @@ class TestBiffDrawingToXml extends BaseTestIteratingXLS { excludes.put("clusterfuzz-testcase-minimized-POIHSSFFuzzer-5285517825277952.xls", IllegalArgumentException.class); excludes.put("clusterfuzz-testcase-minimized-POIHSSFFuzzer-5436547081830400.xls", IllegalArgumentException.class); excludes.put("clusterfuzz-testcase-minimized-POIHSSFFuzzer-5889658057523200.xls", IndexOutOfBoundsException.class); + excludes.put("clusterfuzz-testcase-minimized-POIHSSFFuzzer-4977868385681408.xls", IllegalArgumentException.class); return excludes; } diff --git a/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java b/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java index e21e359767..12854be920 100644 --- a/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java +++ b/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java @@ -138,7 +138,9 @@ class TestDrawingAggregate { File[] files = testData.listFiles((dir, name) -> name.endsWith(".xls")); assertNotNull(files, "Need to find files in test-data path, had path: " + testData); return Stream.of(files). - filter(file -> !file.getName().equals("clusterfuzz-testcase-minimized-POIHSSFFuzzer-5285517825277952.xls")). + filter(file -> + !file.getName().equals("clusterfuzz-testcase-minimized-POIHSSFFuzzer-5285517825277952.xls") && + !file.getName().equals("clusterfuzz-testcase-minimized-POIHSSFFuzzer-4977868385681408.xls")). map(Arguments::of); } |