Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix issue in IOUtils.toByteArrayWithMaxLength 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1898856 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-03-11 17:03:36 +00:00
parent 85356f1d54
commit e7f9cd277d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
poi/src/main/java/org/apache/poi/util/IOUtils.java
View File

@ -171,7 +171,7 @@ public final class IOUtils {
* @throws RecordFormatException If the requested length is invalid. * @throws RecordFormatException If the requested length is invalid.
*/ */
public static byte[] toByteArray(InputStream stream, final int length, final int maxLength) throws IOException { 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 * @since POI 5.2.1
*/ */
public static byte[] toByteArrayWithMaxLength(InputStream stream, final int maxLength) throws IOException { 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, 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) { if (length < 0 || maxLength < 0) {
throw new RecordFormatException("Can't allocate an array of length < 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); final int derivedLen = Math.min(length, derivedMaxLength);
try (UnsynchronizedByteArrayOutputStream baos = final int bufferLen = isLengthKnown ? derivedLen : 4096;
new UnsynchronizedByteArrayOutputStream(derivedLen == Integer.MAX_VALUE ? 4096 : derivedLen)) { try (UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream(bufferLen)) {
byte[] buffer = new byte[4096]; byte[] buffer = new byte[4096];
int totalBytes = 0, readBytes; int totalBytes = 0, readBytes;
do { do {