commit fe3b4645b7b9b7eab10749d76fbc88adcd941c9c
author PJ Fanning <fanningpj@apache.org> Fri Apr 28 09:13:08 2023 +0000
committer PJ Fanning <fanningpj@apache.org> Fri Apr 28 09:13:08 2023 +0000
tree 6070a02262c2576b6264deb1d342eb89e82d1059
parent b88f3ac0ab47f8a15a865597a0daffa87a33e65e

[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

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

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 a593091..3567e66 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 @@
      */
     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;
         }
     }