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 with broken files when handling paint-style for fill

Browse Source
This commit is contained in:
Dominik Stadler 2026-01-07 19:32:26 +01:00
parent ac989335d7
commit befc941dcf
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java
View File

@ -244,7 +244,12 @@ public final class HSLFFill {
if (!FILL_USE_FILLED.isSet(propVal) && masterProp != null) {
int masterId = masterProp.getPropertyValue();
HSLFShape o = shape.getSheet().getMasterSheet().getShapes().stream().filter(s -> s.getShapeId() == masterId).findFirst().orElse(null);
HSLFMasterSheet masterSheet = shape.getSheet().getMasterSheet();
if (masterSheet == null) {
return null;
}
HSLFShape o = masterSheet.getShapes().stream().filter(s -> s.getShapeId() == masterId).findFirst().orElse(null);
return o != null ? o.getFillStyle().getPaint() : null;
}

BIN
test-data/slideshow/2100a8d44da546f97ab7795c500a58bed6cb655d.ppt Normal file
View File

Binary file not shown.

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

Binary file not shown.