pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

add extra max size config

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1898238 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-02-19 22:34:44 +00:00
parent 7005a44cc7
commit 699d71e524
11 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
poi-ooxml-lite-agent/src/main/java9/module-info.class
View File

Binary file not shown.

2
poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
View File

@ -556,7 +556,7 @@ public class XMLSlideShow extends POIXMLDocument
*/
@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);
}

2
poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
View File

@ -104,7 +104,7 @@ public final class XSLFPictureData extends POIXMLDocumentPart implements Picture
*/
public byte[] getData() {
try (InputStream stream = getInputStream()) {
return IOUtils.toByteArray(stream, getMaxImageSize());
return IOUtils.toByteArrayWithMaxLength(stream, getMaxImageSize());
} catch (IOException e) {
throw new POIXMLException(e);
}

2
poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
View File

@ -105,7 +105,7 @@ public class XSSFPictureData extends POIXMLDocumentPart implements PictureData {
*/
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);
}

2
poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
View File

@ -94,7 +94,7 @@ public class XWPFChart extends XDDFChart {
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);
}

2
poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
View File

@ -107,7 +107,7 @@ public class XWPFComments extends POIXMLDocumentPart {
* @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);
}

2
poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
View File

@ -1520,7 +1520,7 @@ public class XWPFDocument extends POIXMLDocument implements Document, IBody {
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);

2
poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
View File

@ -279,7 +279,7 @@ public abstract class XWPFHeaderFooter extends POIXMLDocumentPart implements IBo
* @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);
}

4
poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
View File

@ -111,7 +111,7 @@ public class XWPFPictureData extends POIXMLDocumentPart {
*/
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);
}
@ -165,7 +165,7 @@ public class XWPFPictureData extends POIXMLDocumentPart {
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);
}

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

@ -202,6 +202,45 @@ public final class IOUtils {
}
}
/**
* 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) {

BIN
poi/src/test/java9/module-info.class
View File

Binary file not shown.