From 5cb768379d6a26de336117402959d960de5cf91b Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Fri, 8 Sep 2023 16:02:13 +0000 Subject: Bug 66425: Avoid a NullPointerException found via oss-fuzz We try to avoid throwing NullPointerException, but it was possible to trigger one here with a specially crafted input-file Should fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=62128 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1912199 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/hwpf/converter/TestWordToConverterSuite.java | 8 +++----- .../org/apache/poi/hwpf/converter/TestWordToTextConverter.java | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'poi-scratchpad/src/test') diff --git a/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java index 71f4327133..a2aac7b19f 100644 --- a/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java +++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java @@ -38,8 +38,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -public class TestWordToConverterSuite -{ +public class TestWordToConverterSuite { /** * YK: a quick hack to exclude failing documents from the suite. */ @@ -60,7 +59,8 @@ public class TestWordToConverterSuite "clusterfuzz-testcase-minimized-POIHWPFFuzzer-5418937293340672.doc", "TestHPSFWritingFunctionality.doc", "clusterfuzz-testcase-minimized-POIHWPFFuzzer-4947285593948160.doc", - "clusterfuzz-testcase-minimized-POIHWPFFuzzer-5440721166139392.doc" + "clusterfuzz-testcase-minimized-POIHWPFFuzzer-5440721166139392.doc", + "clusterfuzz-testcase-minimized-POIHWPFFuzzer-5050208641482752.doc" ); public static Stream files() { @@ -139,6 +139,4 @@ public class TestWordToConverterSuite // no exceptions assertNotNull(stringWriter.toString()); } - - } diff --git a/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java index 30e46e5d9f..2b2cfed94e 100644 --- a/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java +++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java @@ -52,7 +52,8 @@ public class TestWordToTextConverter { "clusterfuzz-testcase-minimized-POIHWPFFuzzer-5418937293340672.doc", "TestHPSFWritingFunctionality.doc", "clusterfuzz-testcase-minimized-POIHWPFFuzzer-4947285593948160.doc", - "clusterfuzz-testcase-minimized-POIHWPFFuzzer-5440721166139392.doc" + "clusterfuzz-testcase-minimized-POIHWPFFuzzer-5440721166139392.doc", + "clusterfuzz-testcase-minimized-POIHWPFFuzzer-5050208641482752.doc" ); /** -- cgit v1.2.3