Author: fanningpj
Date: Fri Mar 11 21:24:51 2022
New Revision: 1898861
URL: http://svn.apache.org/viewvc?rev=1898861&view=rev
Log:
fix issue in IOUtils.toByteArrayWithMaxLength
Modified:
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/XWPFPictureData.java
poi/trunk/poi/src/main/java/org/apache/poi/util/IOUtils.java
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=1898861&r1=1898860&r2=1898861&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
Fri Mar 11 21:24:51 2022
@@ -92,13 +92,11 @@ public class XWPFChart extends XDDFChart
public Long getChecksum() {
if (this.checksum == null) {
- byte[] data;
try (InputStream is = getPackagePart().getInputStream()) {
- data = IOUtils.toByteArrayWithMaxLength(is,
XWPFPictureData.getMaxImageSize());
+ this.checksum = IOUtils.calculateChecksum(is);
} catch (IOException e) {
throw new POIXMLException(e);
}
- this.checksum = IOUtils.calculateChecksum(data);
}
return this.checksum;
}
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=1898861&r1=1898860&r2=1898861&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
Fri Mar 11 21:24:51 2022
@@ -163,13 +163,11 @@ public class XWPFPictureData extends POI
public Long getChecksum() {
if (this.checksum == null) {
- byte[] data;
try (InputStream is = getPackagePart().getInputStream()) {
- data = IOUtils.toByteArrayWithMaxLength(is, getMaxImageSize());
+ this.checksum = IOUtils.calculateChecksum(is);
} catch (IOException e) {
throw new POIXMLException(e);
}
- this.checksum = IOUtils.calculateChecksum(data);
}
return this.checksum;
}
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=1898861&r1=1898860&r2=1898861&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 Fri Mar 11
21:24:51 2022
@@ -202,7 +202,7 @@ public final class IOUtils {
}
final int derivedLen = Math.min(length, derivedMaxLength);
- final int bufferLen = isLengthKnown ? derivedLen : 4096;
+ final int bufferLen = isLengthKnown ? derivedLen : Math.min(4096,
derivedLen);
try (UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream(bufferLen)) {
byte[] buffer = new byte[4096];
int totalBytes = 0, readBytes;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
