moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix two more places where wrong/invalid files can lead to file-handle leaks currently

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1737489 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2016-04-02 11:01:56 +00:00
parent 205055b83c
commit e8263f9d8f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
View File

@ -429,6 +429,7 @@ public abstract class OPCPackage implements RelationshipSource, Closeable {
if (this.contentTypeManager == null) { if (this.contentTypeManager == null) {
logger.log(POILogger.WARN, logger.log(POILogger.WARN,
"Unable to call close() on a package that hasn't been fully opened yet"); "Unable to call close() on a package that hasn't been fully opened yet");
revert();
return; return;
} }

7
src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
View File

@ -247,8 +247,11 @@ public final class ZipHelper {
// Peek at the first few bytes to sanity check // Peek at the first few bytes to sanity check
FileInputStream input = new FileInputStream(file); FileInputStream input = new FileInputStream(file);
verifyZipHeader(input); try {
input.close(); verifyZipHeader(input);
} finally {
input.close();
}
// Open as a proper zip file // Open as a proper zip file
return new ZipSecureFile(file); return new ZipSecureFile(file);