You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/03/11 17:03:36 UTC
svn commit: r1898856 - /poi/trunk/poi/src/main/java/org/apache/poi/util/IOUtils.java
Author: fanningpj
Date: Fri Mar 11 17:03:36 2022
New Revision: 1898856
URL: http://svn.apache.org/viewvc?rev=1898856&view=rev
Log:
fix issue in IOUtils.toByteArrayWithMaxLength
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/util/IOUtils.java
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=1898856&r1=1898855&r2=1898856&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 17:03:36 2022
@@ -171,7 +171,7 @@ public final class IOUtils {
* @throws RecordFormatException If the requested length is invalid.
*/
public static byte[] toByteArray(InputStream stream, final int length, final int maxLength) throws IOException {
- return toByteArray(stream, length, maxLength, true);
+ return toByteArray(stream, length, maxLength, true, length != Integer.MAX_VALUE);
}
/**
@@ -188,11 +188,11 @@ public final class IOUtils {
* @since POI 5.2.1
*/
public static byte[] toByteArrayWithMaxLength(InputStream stream, final int maxLength) throws IOException {
- return toByteArray(stream, maxLength, maxLength, false);
+ return toByteArray(stream, maxLength, maxLength, false, false);
}
private static byte[] toByteArray(InputStream stream, final int length, final int maxLength,
- final boolean checkEOFException) throws IOException {
+ final boolean checkEOFException, final boolean isLengthKnown) throws IOException {
if (length < 0 || maxLength < 0) {
throw new RecordFormatException("Can't allocate an array of length < 0");
}
@@ -202,8 +202,8 @@ public final class IOUtils {
}
final int derivedLen = Math.min(length, derivedMaxLength);
- try (UnsynchronizedByteArrayOutputStream baos =
- new UnsynchronizedByteArrayOutputStream(derivedLen == Integer.MAX_VALUE ? 4096 : derivedLen)) {
+ final int bufferLen = isLengthKnown ? derivedLen : 4096;
+ try (UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(bufferLen)) {
byte[] buffer = new byte[4096];
int totalBytes = 0, readBytes;
do {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org