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

Close resources correctly when opening encrypted documents in the TextExtractor 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1828378 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2018-04-04 19:41:16 +00:00
parent 166437912a
commit 1079e66ea7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
View File

@ -132,7 +132,7 @@ public class ExtractorFactory {
try { try {
fs = new NPOIFSFileSystem(f); fs = new NPOIFSFileSystem(f);
if (fs.getRoot().hasEntry(Decryptor.DEFAULT_POIFS_ENTRY)) { if (fs.getRoot().hasEntry(Decryptor.DEFAULT_POIFS_ENTRY)) {
return createEncyptedOOXMLExtractor(fs); return createEncryptedOOXMLExtractor(fs);
} }
POIOLE2TextExtractor extractor = createExtractor(fs); POIOLE2TextExtractor extractor = createExtractor(fs);
extractor.setFilesystem(fs); extractor.setFilesystem(fs);
@ -161,7 +161,7 @@ public class ExtractorFactory {
case OLE2: case OLE2:
NPOIFSFileSystem fs = new NPOIFSFileSystem(is); NPOIFSFileSystem fs = new NPOIFSFileSystem(is);
boolean isEncrypted = fs.getRoot().hasEntry(Decryptor.DEFAULT_POIFS_ENTRY); boolean isEncrypted = fs.getRoot().hasEntry(Decryptor.DEFAULT_POIFS_ENTRY);
return isEncrypted ? createEncyptedOOXMLExtractor(fs) : createExtractor(fs); return isEncrypted ? createEncryptedOOXMLExtractor(fs) : createExtractor(fs);
case OOXML: case OOXML:
return createExtractor(OPCPackage.open(is)); return createExtractor(OPCPackage.open(is));
default: default:
@ -403,7 +403,7 @@ public class ExtractorFactory {
throw new IllegalStateException("Not yet supported"); throw new IllegalStateException("Not yet supported");
} }
private static POIXMLTextExtractor createEncyptedOOXMLExtractor(NPOIFSFileSystem fs) private static POIXMLTextExtractor createEncryptedOOXMLExtractor(NPOIFSFileSystem fs)
throws IOException { throws IOException {
String pass = Biff8EncryptionKey.getCurrentUserPassword(); String pass = Biff8EncryptionKey.getCurrentUserPassword();
if (pass == null) { if (pass == null) {
@ -425,6 +425,10 @@ public class ExtractorFactory {
throw new EncryptedDocumentException(e); throw new EncryptedDocumentException(e);
} finally { } finally {
IOUtils.closeQuietly(is); IOUtils.closeQuietly(is);
// also close the NPOIFSFileSystem here as we read all the data
// while decrypting
fs.close();
} }
} }
} }