Author: fanningpj
Date: Thu Apr 10 13:58:44 2025
New Revision: 1924994
URL: http://svn.apache.org/viewvc?rev=1924994&view=rev
Log:
[bug-69628] more changes to getMax methods
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java?rev=1924994&r1=1924993&r2=1924994&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
Thu Apr 10 13:58:44 2025
@@ -123,8 +123,8 @@ public class ZipArchiveThresholdInputStr
final String entryName = entry == null ? "not set" : entry.getName();
// check the file size first, in case we are working on uncompressed
streams
- if (payloadSize > MAX_ENTRY_SIZE) {
- throw new IOException(String.format(Locale.ROOT,
MAX_ENTRY_SIZE_MSG, payloadSize, rawSize, MAX_ENTRY_SIZE, entryName));
+ if (payloadSize > getMaxEntrySize()) {
+ throw new IOException(String.format(Locale.ROOT,
MAX_ENTRY_SIZE_MSG, payloadSize, rawSize, getMaxEntrySize(), entryName));
}
// don't alert for small expanded size
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java?rev=1924994&r1=1924993&r2=1924994&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
Thu Apr 10 13:58:44 2025
@@ -107,7 +107,7 @@ public abstract class XSSFBParser {
}
if (records == null || records.get(recordId)) {
- byte[] buff = IOUtils.safelyAllocate(recordLength,
MAX_RECORD_LENGTH);
+ byte[] buff = IOUtils.safelyAllocate(recordLength,
getMaxRecordLength());
is.readFully(buff);
handleRecord(recordId, buff);
} else {
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java?rev=1924994&r1=1924993&r2=1924994&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java
Thu Apr 10 13:58:44 2025
@@ -17,8 +17,6 @@
package org.apache.poi.hdgf.streams;
-import org.apache.logging.log4j.Logger;
-import org.apache.poi.logging.PoiLogManager;
import org.apache.poi.hdgf.chunks.ChunkFactory;
import org.apache.poi.hdgf.pointers.Pointer;
import org.apache.poi.hdgf.pointers.PointerFactory;
@@ -28,8 +26,6 @@ import org.apache.poi.hdgf.pointers.Poin
* other data too.
*/
public class PointerContainingStream extends Stream { // TODO - instantiable
superclass
- private static final Logger LOG =
PoiLogManager.getLogger(PointerContainingStream.class);
-
private static int MAX_CHILDREN_NESTING = 500;
private final Pointer[] childPointers;
@@ -68,9 +64,9 @@ public class PointerContainingStream ext
}
private void findChildren(byte[] documentData, int nesting) {
- if (nesting > MAX_CHILDREN_NESTING) {
+ if (nesting > getMaxChildrenNesting()) {
throw new IllegalArgumentException("Encountered too deep nesting,
cannot process stream " +
- "with more than " + MAX_CHILDREN_NESTING + " nested
children. " +
+ "with more than " + getMaxChildrenNesting() + " nested
children. " +
"Some data could not be parsed. You can call
setMaxChildrenNesting() to adjust " +
"this limit.");
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=1924994&r1=1924993&r2=1924994&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
Thu Apr 10 13:58:44 2025
@@ -234,7 +234,8 @@ public final class HSSFWorkbook extends
* @return the max image length allowed for HSSFWorkbook
*/
public static int getMaxImageLength() {
- return MAX_IMAGE_LENGTH;
+ final int ioMaxSize = IOUtils.getByteArrayMaxOverride();
+ return ioMaxSize < 0 ? MAX_IMAGE_LENGTH : Math.min(MAX_IMAGE_LENGTH,
ioMaxSize);
}
/**
@@ -1978,7 +1979,7 @@ public final class HSSFWorkbook extends
case PICTURE_TYPE_WMF:
// remove first 22 bytes if file starts with the WMF placeable
header
if (FileMagic.valueOf(pictureData) == FileMagic.WMF) {
- pictureData = IOUtils.safelyClone(pictureData, 22,
pictureData.length - 22, MAX_IMAGE_LENGTH);
+ pictureData = IOUtils.safelyClone(pictureData, 22,
pictureData.length - 22, getMaxImageLength());
}
// fall through
case PICTURE_TYPE_EMF:
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java?rev=1924994&r1=1924993&r2=1924994&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
Thu Apr 10 13:58:44 2025
@@ -155,7 +155,7 @@ final class FunctionMetadataReader {
// (all unspecified params are assumed to be the same as the last)
nItems --;
}
- byte[] result = IOUtils.safelyAllocate(nItems, MAX_RECORD_LENGTH);
+ byte[] result = IOUtils.safelyAllocate(nItems, getMaxRecordLength());
for (int i = 0; i < nItems; i++) {
result[i] = parseOperandTypeCode(array[i]);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
