pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid NPE in HSSFShapeGroup.setShapeId()

Browse Source
This commit is contained in:
Dominik Stadler 2026-02-19 20:19:41 +01:00
parent 260b22fb09
commit 839ce4a0f4
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
View File

@ -355,7 +355,11 @@ public class HSSFShapeGroup extends HSSFShape implements HSSFShapeContainer {
EscherContainerRecord containerRecord = getEscherContainer().getChildById(EscherContainerRecord.SP_CONTAINER); EscherContainerRecord containerRecord = getEscherContainer().getChildById(EscherContainerRecord.SP_CONTAINER);
EscherSpRecord spRecord = containerRecord.getChildById(EscherSpRecord.RECORD_ID); EscherSpRecord spRecord = containerRecord.getChildById(EscherSpRecord.RECORD_ID);
spRecord.setShapeId(shapeId); spRecord.setShapeId(shapeId);
CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) getObjRecord().getSubRecords().get(0); ObjRecord objRecord = getObjRecord();
if (objRecord == null) {
throw new IllegalStateException("Did not have an ObjRecord for the HSSFShapeGroup");
}
CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) objRecord.getSubRecords().get(0);
cod.setObjectId((short) (shapeId % 1024)); cod.setObjectId((short) (shapeId % 1024));
} }

3
poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
View File

@ -139,7 +139,8 @@ class TestDrawingAggregate {
!file.getName().equals("clusterfuzz-testcase-minimized-POIHSSFFuzzer-5285517825277952.xls") && !file.getName().equals("clusterfuzz-testcase-minimized-POIHSSFFuzzer-5285517825277952.xls") &&
!file.getName().equals("clusterfuzz-testcase-minimized-POIHSSFFuzzer-4977868385681408.xls") && !file.getName().equals("clusterfuzz-testcase-minimized-POIHSSFFuzzer-4977868385681408.xls") &&
!file.getName().equals("crash-e329fca9087fe21bca4a80c8bc472a661c98d860.xls") && !file.getName().equals("crash-e329fca9087fe21bca4a80c8bc472a661c98d860.xls") &&
!file.getName().equals("cf9f845e73447b092477d0472402a5baea4b8c9f.xls")). !file.getName().equals("cf9f845e73447b092477d0472402a5baea4b8c9f.xls") &&
!file.getName().equals("LIBRE_OFFICE-94379-0.zip-57.xls")).
map(Arguments::of); map(Arguments::of);
} }

BIN
test-data/spreadsheet/LIBRE_OFFICE-94379-0.zip-57.xls Executable file
View File

Binary file not shown.

BIN
test-data/spreadsheet/stress.xls
View File

Binary file not shown.