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

[bug-65639] take BYTE_ARRAY_MAX_OVERRIDE into account in IOUtils#toByteArray 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1898231 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-02-19 20:50:51 +00:00
parent 8e9496a475
commit a02df8a2c8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,10 @@ public final class IOUtils {
} }
} }
private static int getByteArrayLimit() {
return BYTE_ARRAY_MAX_OVERRIDE < 0 ? Integer.MAX_VALUE : BYTE_ARRAY_MAX_OVERRIDE;
}
/** /**
* Peeks at the first N bytes of the stream. Returns those bytes, but * Peeks at the first N bytes of the stream. Returns those bytes, but
* with the stream unaffected. Requires a stream that supports mark/reset, * with the stream unaffected. Requires a stream that supports mark/reset,
@ -130,14 +134,15 @@ public final class IOUtils {
} }
/** /**
* Reads all the data from the input stream, and returns the bytes read. * Reads all the data from the input stream, and returns the bytes read. If {@link #setByteArrayMaxOverride(int)}
* is used then that limit is applied and this call will fail if the array size exceeds the configured limit.
* *
* @param stream The byte stream of data to read. * @param stream The byte stream of data to read.
* @return A byte array with the read bytes. * @return A byte array with the read bytes.
* @throws IOException If reading data fails or EOF is encountered too early for the given length. * @throws IOException If reading data fails or EOF is encountered too early for the given length.
*/ */
public static byte[] toByteArray(InputStream stream) throws IOException { public static byte[] toByteArray(InputStream stream) throws IOException {
return toByteArray(stream, Integer.MAX_VALUE); return toByteArray(stream, getByteArrayLimit());
} }
/** /**
@ -150,7 +155,7 @@ public final class IOUtils {
* @throws IOException If reading data fails or EOF is encountered too early for the given length. * @throws IOException If reading data fails or EOF is encountered too early for the given length.
*/ */
public static byte[] toByteArray(InputStream stream, final int length) throws IOException { public static byte[] toByteArray(InputStream stream, final int length) throws IOException {
return toByteArray(stream, length, Integer.MAX_VALUE); return toByteArray(stream, length, getByteArrayLimit());
} }