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 malformed wmf headers

Browse Source
This commit is contained in:
Dominik Stadler 2026-02-14 20:04:58 +01:00
parent 692caf0f36
commit bc02ef0703
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java
View File

@ -511,8 +511,18 @@ public class HwmfMisc {
@Override @Override
public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException { public int init(LittleEndianInputStream leis, long recordSize, int recordFunction) throws IOException {
style = HwmfBrushStyle.valueOf(leis.readUShort()); int brushStyle = leis.readUShort();
colorUsage = ColorUsage.valueOf(leis.readUShort()); style = HwmfBrushStyle.valueOf(brushStyle);
if (style == null) {
throw new IllegalArgumentException("Could not read brush-style " + brushStyle);
}
int colorUsageEnum = leis.readUShort();
colorUsage = ColorUsage.valueOf(colorUsageEnum);
if (colorUsage == null) {
throw new IllegalArgumentException("Could not read color-usage " + colorUsage);
}
int size = 2*LittleEndianConsts.SHORT_SIZE; int size = 2*LittleEndianConsts.SHORT_SIZE;
switch (style) { switch (style) {
case BS_SOLID: case BS_SOLID:

BIN
test-data/slideshow/clusterfuzz-testcase-minimized-6701721724125184.wmf Normal file
View File

Binary file not shown.

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

Binary file not shown.