From: Tim Allison Date: Mon, 25 Sep 2017 12:53:10 +0000 (+0000) Subject: Bug 61349 -- bump limits on classes that caused regressions in Dominik's regression... X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7a2ce0976190fe560246febbb0e637e09fe3a7cb;p=poi.git Bug 61349 -- bump limits on classes that caused regressions in Dominik's regression corpus. Many thanks to Dominik Stadler for running the regression tests!!! git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1809623 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/poi/ddf/EscherBlipRecord.java b/src/java/org/apache/poi/ddf/EscherBlipRecord.java index df49c4747e..f49f09f0e8 100644 --- a/src/java/org/apache/poi/ddf/EscherBlipRecord.java +++ b/src/java/org/apache/poi/ddf/EscherBlipRecord.java @@ -23,7 +23,7 @@ import org.apache.poi.util.LittleEndian; public class EscherBlipRecord extends EscherRecord { //arbitrarily selected; may need to increase - private static final int MAX_RECORD_LENGTH = 100_000_000; + private static final int MAX_RECORD_LENGTH = 104_857_600; public static final short RECORD_ID_START = (short) 0xF018; public static final short RECORD_ID_END = (short) 0xF117; diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java index 7b5a52e2c3..7e679f27aa 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java @@ -67,7 +67,7 @@ import org.apache.poi.util.LittleEndian; public class ExOleObjAtom extends RecordAtom { //arbitrarily selected; may need to increase - private static final int MAX_RECORD_LENGTH = 1_000_000; + private static final int MAX_RECORD_LENGTH = 10_485_760; /** * The object) is displayed as an embedded object inside of a container, diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java index fb3d246897..7f6f6ab0d5 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java @@ -55,7 +55,7 @@ import org.apache.poi.util.POILogger; public final class PPDrawing extends RecordAtom { //arbitrarily selected; may need to increase - private static final int MAX_RECORD_LENGTH = 1_000_000; + private static final int MAX_RECORD_LENGTH = 10_485_760; private byte[] _header; diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java index 19a536e3cd..694f2ba148 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java @@ -37,7 +37,7 @@ import java.util.Iterator; public final class PPDrawingGroup extends RecordAtom { //arbitrarily selected; may need to increase - private static final int MAX_RECORD_LENGTH = 100_000; + private static final int MAX_RECORD_LENGTH = 10_485_760; private byte[] _header; diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java b/src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java index b29f810c1c..63225ebcb4 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java @@ -32,7 +32,7 @@ public final class SoundData extends RecordAtom { //arbitrarily selected; may need to increase - private static final int MAX_RECORD_LENGTH = 1_000_000; + private static final int MAX_RECORD_LENGTH = 10_485_760; /** * Record header. diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java index 280b7a9786..011bc07296 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java @@ -40,7 +40,7 @@ public final class ListLevel { //arbitrarily selected; may need to increase - private static final int MAX_RECORD_LENGTH = 100_000; + private static final int MAX_RECORD_LENGTH = 10_485_760; private static final POILogger logger = POILogFactory .getLogger( ListLevel.class ); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java index 9f71f24595..c838a1a21e 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java @@ -35,7 +35,7 @@ import org.apache.poi.util.LittleEndian; public final class PlexOfCps { //arbitrarily selected; may need to increase - private static final int MAX_RECORD_LENGTH = 100_000; + private static final int MAX_RECORD_LENGTH = 10_485_760; private int _iMac; private int _cbStruct;