This is an automated email from the ASF dual-hosted git repository. centic9 pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/poi.git
commit f6f957bb5d1757f8b071f3df289f8b970514c437 Author: Dominik Stadler <[email protected]> AuthorDate: Sun Nov 1 09:05:57 2026 +0100 Replace assert with log This fixes https://issues.oss-fuzz.com/issues/579662545 --- .../poi/hemf/record/emfplus/HemfPlusMisc.java | 8 ++++++- .../poi/hemf/record/emfplus/TestHemfPlusMisc.java | 27 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java index eee3d40bb1..004c13b848 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java @@ -28,11 +28,13 @@ import java.io.IOException; import java.util.Map; import java.util.function.Supplier; +import org.apache.logging.log4j.Logger; import org.apache.poi.hemf.draw.HemfDrawProperties; import org.apache.poi.hemf.draw.HemfGraphics; import org.apache.poi.hemf.record.emf.HemfFill; import org.apache.poi.hemf.record.emf.HemfRecord.RenderBounds; import org.apache.poi.hwmf.record.HwmfRegionMode; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.BitField; import org.apache.poi.util.BitFieldFactory; import org.apache.poi.util.GenericRecordUtil; @@ -41,6 +43,8 @@ import org.apache.poi.util.LittleEndianInputStream; @SuppressWarnings("WeakerAccess") public class HemfPlusMisc { + private static final Logger LOG = PoiLogManager.getLogger(HemfPlusMisc.class); + public interface EmfPlusObjectId { BitField OBJECT_ID = BitFieldFactory.getInstance(0x00FF); @@ -101,7 +105,9 @@ public class HemfPlusMisc { @Override public long init(LittleEndianInputStream leis, long dataSize, long recordId, int flags) throws IOException { this.flags = flags; - assert(dataSize == 0); + if (dataSize != 0) { + LOG.atWarn().log("Invalid dataSize, should be 0: {}", dataSize); + } recordType = HemfPlusRecordType.getById(recordId); return 0; } diff --git a/poi-scratchpad/src/test/java/org/apache/poi/hemf/record/emfplus/TestHemfPlusMisc.java b/poi-scratchpad/src/test/java/org/apache/poi/hemf/record/emfplus/TestHemfPlusMisc.java new file mode 100644 index 0000000000..1b16a7dd95 --- /dev/null +++ b/poi-scratchpad/src/test/java/org/apache/poi/hemf/record/emfplus/TestHemfPlusMisc.java @@ -0,0 +1,27 @@ +package org.apache.poi.hemf.record.emfplus; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.io.IOException; + +import org.apache.commons.io.input.NullInputStream; +import org.apache.poi.util.LittleEndianInputStream; +import org.junit.jupiter.api.Test; + +class TestHemfPlusMisc { + @Test + void testInit() throws IOException { + HemfPlusMisc.EmfPlusFlagOnly rec = new HemfPlusMisc.EmfPlusSetPixelOffsetMode(); + rec.init(new LittleEndianInputStream(NullInputStream.nullInputStream()), 0, 0, 3); + + assertEquals(3, rec.getFlags()); + } + + @Test + void testInitInvalidDataSize() throws IOException { + HemfPlusMisc.EmfPlusFlagOnly rec = new HemfPlusMisc.EmfPlusSetPixelOffsetMode(); + rec.init(new LittleEndianInputStream(NullInputStream.nullInputStream()), 1, 0, 3); + + assertEquals(3, rec.getFlags()); + } +} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
