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 2021/12/28 02:48:28 UTC
svn commit: r1896464 - in /poi/trunk/poi-ooxml/src/main/java/org/apache/poi: poifs/crypt/dsig/OOXMLURIDereferencer.java xssf/binary/XSSFBSharedStringsTable.java xssf/eventusermodel/ReadOnlySharedStringsTable.java xssf/eventusermodel/XSSFBReader.java
Author: fanningpj
Date: Tue Dec 28 02:48:28 2021
New Revision: 1896464
URL: http://svn.apache.org/viewvc?rev=1896464&view=rev
Log:
close input streams for parts
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java?rev=1896464&r1=1896463&r2=1896464&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java Tue Dec 28 02:48:28 2021
@@ -36,6 +36,7 @@ import javax.xml.crypto.URIReference;
import javax.xml.crypto.URIReferenceException;
import javax.xml.crypto.XMLCryptoContext;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -81,7 +82,7 @@ public class OOXMLURIDereferencer implem
return baseUriDereferencer.dereference(uriReference, context);
}
- InputStream dataStream;
+ InputStream dataStream = null;
try {
dataStream = part.getInputStream();
@@ -99,6 +100,7 @@ public class OOXMLURIDereferencer implem
}
}
} catch (IOException e) {
+ IOUtils.closeQuietly(dataStream);
throw new URIReferenceException("I/O error: " + e.getMessage(), e);
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java?rev=1896464&r1=1896463&r2=1896464&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java Tue Dec 28 02:48:28 2021
@@ -68,8 +68,9 @@ public class XSSFBSharedStringsTable imp
// Some workbooks have no shared strings table.
if (parts.size() > 0) {
PackagePart sstPart = parts.get(0);
-
- readFrom(sstPart.getInputStream());
+ try (InputStream stream = sstPart.getInputStream()) {
+ readFrom(stream);
+ }
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java?rev=1896464&r1=1896463&r2=1896464&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java Tue Dec 28 02:48:28 2021
@@ -131,7 +131,9 @@ public class ReadOnlySharedStringsTable
// Some workbooks have no shared strings table.
if (parts.size() > 0) {
PackagePart sstPart = parts.get(0);
- readFrom(sstPart.getInputStream());
+ try (InputStream stream = sstPart.getInputStream()) {
+ readFrom(stream);
+ }
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java?rev=1896464&r1=1896463&r2=1896464&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java Tue Dec 28 02:48:28 2021
@@ -165,7 +165,9 @@ public class XSSFBReader extends XSSFRea
}
PackagePartName commentsName = PackagingURIHelper.createPartName(comments.getTargetURI());
PackagePart commentsPart = sheetPkg.getPackage().getPart(commentsName);
- return new XSSFBCommentsTable(commentsPart.getInputStream());
+ try (InputStream stream = commentsPart.getInputStream()) {
+ return new XSSFBCommentsTable(stream);
+ }
}
} catch (InvalidFormatException | IOException e) {
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org