You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2023/12/30 19:39:31 UTC
svn commit: r1915004 - in /poi/trunk: poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/ poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/ test-data/document/ test-data/spreadsheet/
Author: centic
Date: Sat Dec 30 19:39:31 2023
New Revision: 1915004
URL: http://svn.apache.org/viewvc?rev=1915004&view=rev
Log:
Bug 66425: Avoid exceptions found via poi-fuzz
Prevent NullPointerException
Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=64943
Added:
poi/trunk/test-data/document/clusterfuzz-testcase-minimized-POIHWPFFuzzer-6610789829836800.doc
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
poi/trunk/test-data/spreadsheet/stress.xls
Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java?rev=1915004&r1=1915003&r2=1915004&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java (original)
+++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java Sat Dec 30 19:39:31 2023
@@ -745,6 +745,10 @@ public abstract class AbstractWordConver
}
case FIELD_DROP_DOWN: {
Range fieldContent = field.firstSubrange(parentRange);
+ if (fieldContent == null) {
+ throw new IllegalStateException("Cannot read field content from field " + field + " and range " + parentRange);
+ }
+
CharacterRun cr = fieldContent.getCharacterRun(fieldContent
.numCharacterRuns() - 1);
String[] values = cr.getDropDownListValues();
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java?rev=1915004&r1=1915003&r2=1915004&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java Sat Dec 30 19:39:31 2023
@@ -61,7 +61,8 @@ public class TestWordToConverterSuite {
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-4947285593948160.doc",
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-5440721166139392.doc",
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-5050208641482752.doc",
- "clusterfuzz-testcase-minimized-POIHWPFFuzzer-4892412469968896.doc"
+ "clusterfuzz-testcase-minimized-POIHWPFFuzzer-4892412469968896.doc",
+ "clusterfuzz-testcase-minimized-POIHWPFFuzzer-6610789829836800.doc"
);
public static Stream<Arguments> files() {
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java?rev=1915004&r1=1915003&r2=1915004&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java Sat Dec 30 19:39:31 2023
@@ -54,7 +54,8 @@ public class TestWordToTextConverter {
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-4947285593948160.doc",
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-5440721166139392.doc",
"clusterfuzz-testcase-minimized-POIHWPFFuzzer-5050208641482752.doc",
- "clusterfuzz-testcase-minimized-POIHWPFFuzzer-4892412469968896.doc"
+ "clusterfuzz-testcase-minimized-POIHWPFFuzzer-4892412469968896.doc",
+ "clusterfuzz-testcase-minimized-POIHWPFFuzzer-6610789829836800.doc"
);
/**
Added: poi/trunk/test-data/document/clusterfuzz-testcase-minimized-POIHWPFFuzzer-6610789829836800.doc
URL: http://svn.apache.org/viewvc/poi/trunk/test-data/document/clusterfuzz-testcase-minimized-POIHWPFFuzzer-6610789829836800.doc?rev=1915004&view=auto
==============================================================================
Binary files poi/trunk/test-data/document/clusterfuzz-testcase-minimized-POIHWPFFuzzer-6610789829836800.doc (added) and poi/trunk/test-data/document/clusterfuzz-testcase-minimized-POIHWPFFuzzer-6610789829836800.doc Sat Dec 30 19:39:31 2023 differ
Modified: poi/trunk/test-data/spreadsheet/stress.xls
URL: http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/stress.xls?rev=1915004&r1=1915003&r2=1915004&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org