add extra max size config

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1898237 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
index 126a553f369f3d9a69ebe1eeb311412a8d2a353a..1c51924507c852b02628d926dbe13f1b22149c50 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
@@ -94,7 +94,7 @@ public class XWPFChart extends XDDFChart {
         if (this.checksum == null) {
             byte[] data;
             try (InputStream is = getPackagePart().getInputStream()) {
-                data = IOUtils.toByteArray(is);
+                data = IOUtils.toByteArray(is, XWPFPictureData.getMaxImageSize());
             } catch (IOException e) {
                 throw new POIXMLException(e);
             }

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
index e6b62b8f6ecda52a0c775469785eb618e0cf2f07..52253b6a974faf945752ff3c69b451500b4f0ccc 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
@@ -107,7 +107,7 @@ public class XWPFComments extends POIXMLDocumentPart {
      * @throws IOException            If reading the picture-data from the stream fails.
      */
     public String addPictureData(InputStream is, int format) throws InvalidFormatException, IOException {
-        byte[] data = IOUtils.toByteArray(is);
+        byte[] data = IOUtils.toByteArray(is, XWPFPictureData.getMaxImageSize());
         return addPictureData(data, format);
     }
 

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
index 65936bf9dc4c36d698f1710291e4a56ca5cf86f0..62192da980477b66fb611dc35358a8c019471408 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
@@ -1520,7 +1520,7 @@ public class XWPFDocument extends POIXMLDocument implements Document, IBody {
 
     public String addPictureData(InputStream is, int format) throws InvalidFormatException {
         try {
-            byte[] data = IOUtils.toByteArray(is);
+            byte[] data = IOUtils.toByteArray(is, XWPFPictureData.getMaxImageSize());
             return addPictureData(data, format);
         } catch (IOException e) {
             throw new POIXMLException(e);

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
index a839c587cfcff57c49a24e499da63e1efad08565..4d423e1cbfe0b7b3d930ebf4afddf6f7c44a72a3 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
@@ -279,7 +279,7 @@ public abstract class XWPFHeaderFooter extends POIXMLDocumentPart implements IBo
      * @throws IOException If reading the picture-data from the stream fails.
      */
     public String addPictureData(InputStream is, int format) throws InvalidFormatException, IOException {
-        byte[] data = IOUtils.toByteArray(is);
+        byte[] data = IOUtils.toByteArray(is, XWPFPictureData.getMaxImageSize());
         return addPictureData(data, format);
     }
 

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 d4ea1849b43d9add4efc878c6b0014d5ceeae528..20cebfc175de63c7c370a3cc599b88b48e4fd22c 100644 (file)
--- 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
@@ -34,6 +34,23 @@ import org.apache.poi.util.IOUtils;
  */
 public class XWPFPictureData extends POIXMLDocumentPart {
 
+    private static final int DEFAULT_MAX_IMAGE_SIZE = 100_000_000;
+    private static int MAX_IMAGE_SIZE = DEFAULT_MAX_IMAGE_SIZE;
+
+    /**
+     * @param length the max image size allowed for XSSF pictures
+     */
+    public static void setMaxImageSize(int length) {
+        MAX_IMAGE_SIZE = length;
+    }
+
+    /**
+     * @return the max image size allowed for XSSF pictures
+     */
+    public static int getMaxImageSize() {
+        return MAX_IMAGE_SIZE;
+    }
+
     /**
      * Relationships for each known picture type
      */
@@ -94,7 +111,7 @@ public class XWPFPictureData extends POIXMLDocumentPart {
      */
     public byte[] getData() {
         try (InputStream stream = getPackagePart().getInputStream()) {
-            return IOUtils.toByteArray(stream);
+            return IOUtils.toByteArray(stream, getMaxImageSize());
         } catch (IOException e) {
             throw new POIXMLException(e);
         }
@@ -146,15 +163,11 @@ public class XWPFPictureData extends POIXMLDocumentPart {
 
     public Long getChecksum() {
         if (this.checksum == null) {
-            InputStream is = null;
             byte[] data;
-            try {
-                is = getPackagePart().getInputStream();
-                data = IOUtils.toByteArray(is);
+            try (InputStream is = getPackagePart().getInputStream()) {
+                data = IOUtils.toByteArray(is, getMaxImageSize());
             } catch (IOException e) {
                 throw new POIXMLException(e);
-            } finally {
-                IOUtils.closeQuietly(is);
             }
             this.checksum = IOUtils.calculateChecksum(data);
         }