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 2022/01/06 11:10:00 UTC
svn commit: r1896744 - in /poi/trunk: poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/ test-data/document/ test-data/spreadsheet/
Author: centic
Date: Thu Jan 6 11:10:00 2022
New Revision: 1896744
URL: http://svn.apache.org/viewvc?rev=1896744&view=rev
Log:
Limit allocated elements in the PlfLfo structure for word documents
Use large allocation-detection here as well,
otherwise some documents can try to allocate too much memory.
Added:
poi/trunk/test-data/document/Fuzzed.doc
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
poi/trunk/test-data/spreadsheet/stress.xls
Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java?rev=1896744&r1=1896743&r2=1896744&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java (original)
+++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java Thu Jan 6 11:10:00 2022
@@ -26,6 +26,7 @@ import java.util.NoSuchElementException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.poi.hwpf.model.types.LFOAbstractType;
+import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
@@ -37,10 +38,11 @@ import static org.apache.logging.log4j.u
* Documentation quoted from Page 424 of 621. [MS-DOC] -- v20110315 Word (.doc)
* Binary File Format
*/
-public class PlfLfo
-{
+public class PlfLfo {
private static final Logger LOGGER = LogManager.getLogger(PlfLfo.class);
+ private static final int MAX_NUMBER_OF_LFO = 100_000;
+
/**
* An unsigned integer that specifies the count of elements in both the
* rgLfo and rgLfoData arrays.
@@ -76,6 +78,8 @@ public class PlfLfo
+ Integer.MAX_VALUE + " elements" );
}
+ IOUtils.safelyAllocateCheck(lfoMacLong, MAX_NUMBER_OF_LFO);
+
this._lfoMac = (int) lfoMacLong;
_rgLfo = new LFO[_lfoMac];
_rgLfoData = new LFOData[_lfoMac];
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=1896744&r1=1896743&r2=1896744&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 Thu Jan 6 11:10:00 2022
@@ -54,7 +54,9 @@ public class TestWordToConverterSuite
"password_tika_binaryrc4.doc",
"password_password_cryptoapi.doc",
// WORD 2.0 file
- "word2.doc"
+ "word2.doc",
+ // Corrupt file
+ "Fuzzed.doc"
);
public static Stream<Arguments> files() {
Added: poi/trunk/test-data/document/Fuzzed.doc
URL: http://svn.apache.org/viewvc/poi/trunk/test-data/document/Fuzzed.doc?rev=1896744&view=auto
==============================================================================
Binary files poi/trunk/test-data/document/Fuzzed.doc (added) and poi/trunk/test-data/document/Fuzzed.doc Thu Jan 6 11:10:00 2022 differ
Modified: poi/trunk/test-data/spreadsheet/stress.xls
URL: http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/stress.xls?rev=1896744&r1=1896743&r2=1896744&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