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 5fd7870ce091d4f694f6d5f6bb4d418eb6c07c4b Author: Dominik Stadler <[email protected]> AuthorDate: Wed Oct 28 11:53:51 2026 +0100 Fuzzing: Add workaround for NPE in commons-compress in more places --- .../src/main/java/org/apache/poi/fuzz/POIXSLFFuzzer.java | 16 ++++++++++++++++ .../main/java/org/apache/poi/fuzz/POIXSSFBFuzzer.java | 5 +++++ .../src/main/java/org/apache/poi/fuzz/POIXSSFFuzzer.java | 5 +++++ .../src/main/java/org/apache/poi/fuzz/POIXWPFFuzzer.java | 6 ++++++ 4 files changed, 32 insertions(+) diff --git a/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXSLFFuzzer.java b/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXSLFFuzzer.java index e95ae96c15..0f02b33d12 100644 --- a/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXSLFFuzzer.java +++ b/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXSLFFuzzer.java @@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import org.apache.commons.io.output.NullOutputStream; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; @@ -43,6 +44,11 @@ public class POIXSLFFuzzer { } catch (IOException | POIXMLException | RecordFormatException | OpenXML4JRuntimeException | IndexOutOfBoundsException | IllegalArgumentException e) { // expected here + } catch (NullPointerException e) { + // can be removed when commons-compress is > 1.28.0 and changes from COMPRESS-598 are applied + if (!ExceptionUtils.getStackTrace(e).contains("org.apache.commons.compress.archivers.zip.ZipArchiveInputStream.read")) { + throw e; + } } try (OPCPackage pkg = OPCPackage.open(new ByteArrayInputStream(input))) { @@ -52,6 +58,11 @@ public class POIXSLFFuzzer { } catch (IOException | OpenXML4JException | XmlException | IllegalArgumentException | POIXMLException | RecordFormatException | IllegalStateException | OpenXML4JRuntimeException | IndexOutOfBoundsException e) { // expected here + } catch (NullPointerException e) { + // can be removed when commons-compress is > 1.28.0 and changes from COMPRESS-598 are applied + if (!ExceptionUtils.getStackTrace(e).contains("org.apache.commons.compress.archivers.zip.ZipArchiveInputStream.read")) { + throw e; + } } try (OPCPackage pkg = OPCPackage.open(new ByteArrayInputStream(input))) { @@ -61,6 +72,11 @@ public class POIXSLFFuzzer { } catch (IOException | InvalidFormatException | POIXMLException | IllegalArgumentException | RecordFormatException | IllegalStateException | IndexOutOfBoundsException e) { // expected + } catch (NullPointerException e) { + // can be removed when commons-compress is > 1.28.0 and changes from COMPRESS-598 are applied + if (!ExceptionUtils.getStackTrace(e).contains("org.apache.commons.compress.archivers.zip.ZipArchiveInputStream.read")) { + throw e; + } } } } diff --git a/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXSSFBFuzzer.java b/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXSSFBFuzzer.java index dcb05b98b2..9d7befc9f4 100644 --- a/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXSSFBFuzzer.java +++ b/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXSSFBFuzzer.java @@ -71,6 +71,11 @@ public class POIXSSFBFuzzer { } catch (IOException | InvalidFormatException | NotOfficeXmlFileException | RecordFormatException ex) { // expected + } catch (NullPointerException e) { + // can be removed when commons-compress is > 1.28.0 and changes from COMPRESS-598 are applied + if (!ExceptionUtils.getStackTrace(e).contains("org.apache.commons.compress.archivers.zip.ZipArchiveInputStream.read")) { + throw e; + } } } } diff --git a/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXSSFFuzzer.java b/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXSSFFuzzer.java index 7b477e6473..e7ce0aa2c7 100644 --- a/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXSSFFuzzer.java +++ b/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXSSFFuzzer.java @@ -46,6 +46,11 @@ public class POIXSSFFuzzer { OpenXML4JRuntimeException | IllegalArgumentException | IndexOutOfBoundsException | ArithmeticException e) { // expected here + } catch (NullPointerException e) { + // can be removed when commons-compress is > 1.28.0 and changes from COMPRESS-598 are applied + if (!ExceptionUtils.getStackTrace(e).contains("org.apache.commons.compress.archivers.zip.ZipArchiveInputStream.read")) { + throw e; + } } try (OPCPackage pkg = OPCPackage.open(new ByteArrayInputStream(input))) { diff --git a/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXWPFFuzzer.java b/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXWPFFuzzer.java index 74daa9a55a..25e2e99162 100644 --- a/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXWPFFuzzer.java +++ b/poi-fuzz/src/main/java/org/apache/poi/fuzz/POIXWPFFuzzer.java @@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import org.apache.commons.io.output.NullOutputStream; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException; @@ -61,6 +62,11 @@ public class POIXWPFFuzzer { } catch (IOException | POIXMLException | RecordFormatException | OpenXML4JRuntimeException | IllegalArgumentException | IllegalStateException | IndexOutOfBoundsException e) { // expected + } catch (NullPointerException e) { + // can be removed when commons-compress is > 1.28.0 and changes from COMPRESS-598 are applied + if (!ExceptionUtils.getStackTrace(e).contains("org.apache.commons.compress.archivers.zip.ZipArchiveInputStream.read")) { + throw e; + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
