Author: fanningpj
Date: Sat Feb 19 22:34:44 2022
New Revision: 1898238
URL: http://svn.apache.org/viewvc?rev=1898238&view=rev
Log:
add extra max size config
Modified:
poi/trunk/poi-ooxml-lite-agent/src/main/java9/module-info.class
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
poi/trunk/poi/src/main/java/org/apache/poi/util/IOUtils.java
poi/trunk/poi/src/test/java9/module-info.class
Modified: poi/trunk/poi-ooxml-lite-agent/src/main/java9/module-info.class
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite-agent/src/main/java9/module-info.class?rev=1898238&r1=1898237&r2=1898238&view=diff
==============================================================================
Binary files - no diff available.
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java?rev=1898238&r1=1898237&r2=1898238&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
Sat Feb 19 22:34:44 2022
@@ -556,7 +556,7 @@ public class XMLSlideShow extends POIXML
*/
@Override
public XSLFPictureData addPicture(InputStream is, PictureType format)
throws IOException {
- return addPicture(IOUtils.toByteArray(is,
XSLFPictureData.getMaxImageSize()), format);
+ return addPicture(IOUtils.toByteArrayWithMaxLength(is,
XSLFPictureData.getMaxImageSize()), format);
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java?rev=1898238&r1=1898237&r2=1898238&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
Sat Feb 19 22:34:44 2022
@@ -104,7 +104,7 @@ public final class XSLFPictureData exten
*/
public byte[] getData() {
try (InputStream stream = getInputStream()) {
- return IOUtils.toByteArray(stream, getMaxImageSize());
+ return IOUtils.toByteArrayWithMaxLength(stream, getMaxImageSize());
} catch (IOException e) {
throw new POIXMLException(e);
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java?rev=1898238&r1=1898237&r2=1898238&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
Sat Feb 19 22:34:44 2022
@@ -105,7 +105,7 @@ public class XSSFPictureData extends POI
*/
public byte[] getData() {
try (InputStream inputStream = getPackagePart().getInputStream()) {
- return IOUtils.toByteArray(inputStream, getMaxImageSize());
+ return IOUtils.toByteArrayWithMaxLength(inputStream,
getMaxImageSize());
} catch(IOException e) {
throw new POIXMLException(e);
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java?rev=1898238&r1=1898237&r2=1898238&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
Sat Feb 19 22:34:44 2022
@@ -94,7 +94,7 @@ public class XWPFChart extends XDDFChart
if (this.checksum == null) {
byte[] data;
try (InputStream is = getPackagePart().getInputStream()) {
- data = IOUtils.toByteArray(is,
XWPFPictureData.getMaxImageSize());
+ data = IOUtils.toByteArrayWithMaxLength(is,
XWPFPictureData.getMaxImageSize());
} catch (IOException e) {
throw new POIXMLException(e);
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java?rev=1898238&r1=1898237&r2=1898238&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
Sat Feb 19 22:34:44 2022
@@ -107,7 +107,7 @@ public class XWPFComments extends POIXML
* @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,
XWPFPictureData.getMaxImageSize());
+ byte[] data = IOUtils.toByteArrayWithMaxLength(is,
XWPFPictureData.getMaxImageSize());
return addPictureData(data, format);
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1898238&r1=1898237&r2=1898238&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
Sat Feb 19 22:34:44 2022
@@ -1520,7 +1520,7 @@ public class XWPFDocument extends POIXML
public String addPictureData(InputStream is, int format) throws
InvalidFormatException {
try {
- byte[] data = IOUtils.toByteArray(is,
XWPFPictureData.getMaxImageSize());
+ byte[] data = IOUtils.toByteArrayWithMaxLength(is,
XWPFPictureData.getMaxImageSize());
return addPictureData(data, format);
} catch (IOException e) {
throw new POIXMLException(e);
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java?rev=1898238&r1=1898237&r2=1898238&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
Sat Feb 19 22:34:44 2022
@@ -279,7 +279,7 @@ public abstract class XWPFHeaderFooter e
* @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,
XWPFPictureData.getMaxImageSize());
+ byte[] data = IOUtils.toByteArrayWithMaxLength(is,
XWPFPictureData.getMaxImageSize());
return addPictureData(data, format);
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java?rev=1898238&r1=1898237&r2=1898238&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
Sat Feb 19 22:34:44 2022
@@ -111,7 +111,7 @@ public class XWPFPictureData extends POI
*/
public byte[] getData() {
try (InputStream stream = getPackagePart().getInputStream()) {
- return IOUtils.toByteArray(stream, getMaxImageSize());
+ return IOUtils.toByteArrayWithMaxLength(stream, getMaxImageSize());
} catch (IOException e) {
throw new POIXMLException(e);
}
@@ -165,7 +165,7 @@ public class XWPFPictureData extends POI
if (this.checksum == null) {
byte[] data;
try (InputStream is = getPackagePart().getInputStream()) {
- data = IOUtils.toByteArray(is, getMaxImageSize());
+ data = IOUtils.toByteArrayWithMaxLength(is, getMaxImageSize());
} catch (IOException e) {
throw new POIXMLException(e);
}
Modified: poi/trunk/poi/src/main/java/org/apache/poi/util/IOUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/util/IOUtils.java?rev=1898238&r1=1898237&r2=1898238&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/util/IOUtils.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/util/IOUtils.java Sat Feb 19
22:34:44 2022
@@ -202,6 +202,45 @@ public final class IOUtils {
}
}
+ /**
+ * Reads the input stream, and returns the bytes read.
+ *
+ * @param stream The byte stream of data to read.
+ * @param maxLength if the input is equal to/longer than {@code maxLength}
bytes,
+ * then throw an {@link IOException} complaining about
the length.
+ * use {@link Integer#MAX_VALUE} to disable the check -
if {@link #setByteArrayMaxOverride(int)} is
+ * set then that max of that value and this maxLength is
used
+ * @return A byte array with the read bytes.
+ * @throws IOException If reading data fails or EOF is encountered too
early for the given length.
+ * @since POI 5.2.1
+ */
+ public static byte[] toByteArrayWithMaxLength(InputStream stream, final
int maxLength) throws IOException {
+ if (maxLength < 0L) {
+ throw new RecordFormatException("Can't allocate an array of length
< 0");
+ }
+ final int derivedMaxLength = BYTE_ARRAY_MAX_OVERRIDE <= 0 ? maxLength
: Math.max(maxLength, BYTE_ARRAY_MAX_OVERRIDE);
+
+ try (UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream(derivedMaxLength == Integer.MAX_VALUE ?
4096 : derivedMaxLength)) {
+ byte[] buffer = new byte[4096];
+ int totalBytes = 0, readBytes;
+ do {
+ readBytes = stream.read(buffer, 0, Math.min(buffer.length,
derivedMaxLength - totalBytes));
+ totalBytes += Math.max(readBytes, 0);
+ if (readBytes > 0) {
+ baos.write(buffer, 0, readBytes);
+ }
+
+ checkByteSizeLimit(totalBytes);
+ } while (totalBytes < derivedMaxLength && readBytes > -1);
+
+ if (derivedMaxLength != Integer.MAX_VALUE && totalBytes ==
derivedMaxLength) {
+ throw new IOException("MaxLength (" + derivedMaxLength + ")
reached - stream seems to be invalid.");
+ }
+
+ return baos.toByteArray();
+ }
+ }
+
private static void checkLength(long length, int maxLength) {
if (BYTE_ARRAY_MAX_OVERRIDE > 0) {
if (length > BYTE_ARRAY_MAX_OVERRIDE) {
Modified: poi/trunk/poi/src/test/java9/module-info.class
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java9/module-info.class?rev=1898238&r1=1898237&r2=1898238&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
