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

try to close resources when RuntimeExceptions happen 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1896140 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2021-12-18 18:04:52 +00:00
parent f4bb4560ed
commit b88cb5620a
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
View File

@ -739,24 +739,31 @@ public class POIXMLDocumentPart {
* Since POI 4.1.2 - pkg is closed if this method throws an exception
*/
private static PackagePart getPartFromOPCPackage(OPCPackage pkg, String coreDocumentRel) {
PackageRelationship coreRel = pkg.getRelationshipsByType(coreDocumentRel).getRelationship(0);
try {
PackageRelationship coreRel = pkg.getRelationshipsByType(coreDocumentRel).getRelationship(0);
if (coreRel != null) {
PackagePart pp = pkg.getPart(coreRel);
if (pp == null) {
IOUtils.closeQuietly(pkg);
throw new POIXMLException("OOXML file structure broken/invalid - core document '" + coreRel.getTargetURI() + "' not found.");
if (coreRel != null) {
PackagePart pp = pkg.getPart(coreRel);
if (pp == null) {
IOUtils.closeQuietly(pkg);
throw new POIXMLException("OOXML file structure broken/invalid - core document '" + coreRel.getTargetURI() + "' not found.");
}
return pp;
}
coreRel = pkg.getRelationshipsByType(PackageRelationshipTypes.STRICT_CORE_DOCUMENT).getRelationship(0);
if (coreRel != null) {
IOUtils.closeQuietly(pkg);
throw new POIXMLException("Strict OOXML isn't currently supported, please see bug #57699");
}
return pp;
}
coreRel = pkg.getRelationshipsByType(PackageRelationshipTypes.STRICT_CORE_DOCUMENT).getRelationship(0);
if (coreRel != null) {
IOUtils.closeQuietly(pkg);
throw new POIXMLException("Strict OOXML isn't currently supported, please see bug #57699");
throw new POIXMLException("OOXML file structure broken/invalid - no core document found!");
} catch (POIXMLException e) {
throw e;
} catch (RuntimeException e) {
IOUtils.closeQuietly(pkg);
throw new POIXMLException("OOXML file structure broken/invalid", e);
}
IOUtils.closeQuietly(pkg);
throw new POIXMLException("OOXML file structure broken/invalid - no core document found!");
}
}

2
poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java
View File

@ -130,7 +130,7 @@ public final class ZipPackage extends OPCPackage {
ZipArchiveThresholdInputStream zis = ZipHelper.openZipStream(in); // NOSONAR
try {
this.zipArchive = new ZipInputStreamZipEntrySource(zis);
} catch (final IOException e) {
} catch (final IOException | RuntimeException e) {
IOUtils.closeQuietly(zis);
throw e;
}

19
poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
View File

@ -105,14 +105,17 @@ public final class AesZipFileZipEntrySource implements ZipEntrySource {
}
public static AesZipFileZipEntrySource createZipEntrySource(InputStream is) throws IOException {
// generate session key
byte[] ivBytes = new byte[16], keyBytes = new byte[16];
RandomSingleton.getInstance().nextBytes(ivBytes);
RandomSingleton.getInstance().nextBytes(keyBytes);
final File tmpFile = TempFile.createTempFile("protectedXlsx", ".zip");
copyToFile(is, tmpFile, keyBytes, ivBytes);
IOUtils.closeQuietly(is);
return fileToSource(tmpFile, keyBytes, ivBytes);
try {
// generate session key
byte[] ivBytes = new byte[16], keyBytes = new byte[16];
RandomSingleton.getInstance().nextBytes(ivBytes);
RandomSingleton.getInstance().nextBytes(keyBytes);
final File tmpFile = TempFile.createTempFile("protectedXlsx", ".zip");
copyToFile(is, tmpFile, keyBytes, ivBytes);
return fileToSource(tmpFile, keyBytes, ivBytes);
} finally {
IOUtils.closeQuietly(is);
}
}
private static void copyToFile(InputStream is, File tmpFile, byte[] keyBytes, byte[] ivBytes) throws IOException {