From fe3b4645b7b9b7eab10749d76fbc88adcd941c9c Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 28 Apr 2023 09:13:08 +0000 Subject: [PATCH] [bug-66584] ensure ZipPackage closes input stream when exceptions happen git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1909467 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/poi/openxml4j/opc/ZipPackage.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java index a5930919d2..3567e66074 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java +++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java @@ -127,11 +127,9 @@ public final class ZipPackage extends OPCPackage { */ ZipPackage(InputStream in, PackageAccess access) throws IOException { super(access); - ZipArchiveThresholdInputStream zis = ZipHelper.openZipStream(in); // NOSONAR - try { + try (ZipArchiveThresholdInputStream zis = ZipHelper.openZipStream(in)) { this.zipArchive = new ZipInputStreamZipEntrySource(zis); } catch (final IOException | RuntimeException e) { - IOUtils.closeQuietly(zis); throw e; } }