From f91ff62a553f02f02b7285ae11640eda9e9ee274 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 10 Apr 2025 13:47:33 +0000 Subject: [PATCH] [bug-69628] more changes to getMax methods git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1924992 13f79535-47bb-0310-9956-ffa450edef68 --- .../poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java | 3 ++- .../java/org/apache/poi/xslf/usermodel/XSLFPictureData.java | 3 ++- .../java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java index f7e3b9aeb1..1f40862a7d 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java +++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java @@ -72,7 +72,8 @@ public class TimeStampSimpleHttpClient implements TimeStampHttpClient { * @return the max timestamp response size allowed */ public static int getMaxTimestampResponseSize() { - return MAX_TIMESTAMP_RESPONSE_SIZE; + final int ioMaxSize = IOUtils.getByteArrayMaxOverride(); + return ioMaxSize < 0 ? MAX_TIMESTAMP_RESPONSE_SIZE : Math.min(MAX_TIMESTAMP_RESPONSE_SIZE, ioMaxSize); } diff --git a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java index 60ef156abe..82daee8dbe 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java @@ -58,7 +58,8 @@ public final class XSLFPictureData extends POIXMLDocumentPart implements Picture * @return the max image size allowed for XSLF pictures */ public static int getMaxImageSize() { - return MAX_IMAGE_SIZE; + final int ioMaxSize = IOUtils.getByteArrayMaxOverride(); + return ioMaxSize < 0 ? MAX_IMAGE_SIZE : Math.min(MAX_IMAGE_SIZE, ioMaxSize); } private Long checksum; diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java index d74440fcc9..7d541a627f 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java @@ -49,7 +49,8 @@ public class XWPFPictureData extends POIXMLDocumentPart { * @return the max image size allowed for XSSF pictures */ public static int getMaxImageSize() { - return MAX_IMAGE_SIZE; + final int ioMaxSize = IOUtils.getByteArrayMaxOverride(); + return ioMaxSize < 0 ? MAX_IMAGE_SIZE : Math.min(MAX_IMAGE_SIZE, ioMaxSize); } /**