<unzip> and <untar> could leave streams open. PR 34893

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278254 13f79535-47bb-0310-9956-ffa450edef68

WHATSNEW

@@ -213,6 +213,9 @@ Fixed bugs:
 * Granularity attribute for <sync> task was undocumented.
   Bugzilla report 34871.
 
+* <unzip> and <untar> could leave file handles open on invalid
+  archives.  Bugzilla report 34893.
+
 Other changes:
 --------------
 

src/main/org/apache/tools/ant/taskdefs/Untar.java

@@ -90,13 +90,13 @@ public class Untar extends Expand {
      * @see Expand#expandFile(FileUtils, File, File)
      */
     protected void expandFile(FileUtils fileUtils, File srcF, File dir) {
+        FileInputStream fis = null;
         TarInputStream tis = null;
         try {
             log("Expanding: " + srcF + " into " + dir, Project.MSG_INFO);
+            fis = new FileInputStream(srcF);
             tis = new TarInputStream(
-                compression.decompress(srcF,
-                    new BufferedInputStream(
-                        new FileInputStream(srcF))));
+                compression.decompress(srcF, new BufferedInputStream(fis)));
             TarEntry te = null;
             FileNameMapper mapper = getMapper();
             while ((te = tis.getNextEntry()) != null) {
@@ -111,6 +111,10 @@ public class Untar extends Expand {
                                      ioe, getLocation());
         } finally {
             FileUtils.close(tis);
+            if (tis == null) {
+                FileUtils.close(fis);
+            }
+            
         }
     }
 

src/main/org/apache/tools/zip/ZipFile.java

@@ -138,8 +138,17 @@ public class ZipFile {
     public ZipFile(File f, String encoding) throws IOException {
         this.encoding = encoding;
         archive = new RandomAccessFile(f, "r");
-        populateFromCentralDirectory();
-        resolveLocalFileHeaderData();
+        try {
+            populateFromCentralDirectory();
+            resolveLocalFileHeaderData();
+        } catch (IOException e) {
+            try {
+                archive.close();
+            } catch (IOException e2) {
+                // swallow, throw the original exception instead
+            }
+            throw e;
+        }
     }
 
     /**