*/
@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);
}
*/
public byte[] getData() {
try (InputStream stream = getInputStream()) {
- return IOUtils.toByteArray(stream, getMaxImageSize());
+ return IOUtils.toByteArrayWithMaxLength(stream, getMaxImageSize());
} catch (IOException e) {
throw new POIXMLException(e);
}
*/
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);
}
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);
}
* @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);
}
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);
* @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);
}
*/
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);
}
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);
}
}
}
+ /**
+ * 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) {