The bug fix for [COMPRESS-714] is better done in Commons IO

Author: garydgregory

src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java

@@ -35,6 +35,7 @@
 import java.util.Map;
 import java.util.Objects;
 
+import org.apache.commons.compress.CompressException;
 import org.apache.commons.compress.archivers.ArchiveException;
 import org.apache.commons.compress.archivers.ArchiveFile;
 import org.apache.commons.compress.archivers.zip.ZipEncoding;
@@ -192,13 +193,15 @@ private TarFile(final Builder builder) throws IOException {
                 entries.add(entry);
             }
         } catch (final IOException e) {
-            final ArchiveException ae = new ArchiveException("Error reading Zip content from " + builder, (Throwable) e);
+            final IOException archiveException = e instanceof CompressException
+                    ? (IOException) e
+                    : new ArchiveException("Error reading Zip content from " + builder, (Throwable) e);
             try {
                 this.archive.close();
             } catch (final IOException closeException) {
-                ae.addSuppressed(closeException);
+                archiveException.addSuppressed(closeException);
             }
-            throw ae;
+            throw archiveException;
         }
     }
 

src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java

@@ -49,6 +49,7 @@
 import java.util.zip.Inflater;
 import java.util.zip.ZipException;
 
+import org.apache.commons.compress.CompressException;
 import org.apache.commons.compress.archivers.AbstractArchiveBuilder;
 import org.apache.commons.compress.archivers.ArchiveException;
 import org.apache.commons.compress.archivers.ArchiveFile;
@@ -755,8 +756,8 @@ private ZipFile(final Builder builder) throws IOException {
                 resolveLocalFileHeaderData(entriesWithoutUTF8Flag);
             }
             fillNameMap();
-        } catch (final IOException | IllegalArgumentException e) {
-            final IOException archiveException = e instanceof IOException
+        } catch (final IOException e) {
+            final IOException archiveException = e instanceof CompressException
                     ? (IOException) e
                     : new ArchiveException("Error reading Zip content from " + builder.getName(), (Throwable) e);
             this.closed = true;

src/test/java/org/apache/commons/compress/archivers/zip/ZipCompress714Test.java

@@ -21,9 +21,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import java.io.EOFException;
 import java.io.IOException;
 
+import org.apache.commons.compress.archivers.ArchiveException;
 import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
 import org.junit.jupiter.api.Test;
 
@@ -35,7 +35,7 @@ public class ZipCompress714Test {
     @Test
     public void testIllegalPosition() throws IOException {
         final byte[] data = { 80, 75, 5, 6, -127, 80, 75, 5, 6, 7, -127, -127, -127, 80, 74, 7, 8, -127, -127, -127, -127, -127 };
-        assertThrows(EOFException.class, () -> ZipFile.builder().setChannel(new SeekableInMemoryByteChannel(data)).get());
-        assertThrows(EOFException.class, () -> ZipFile.builder().setByteArray(data).get());
+        assertThrows(ArchiveException.class, () -> ZipFile.builder().setChannel(new SeekableInMemoryByteChannel(data)).get());
+        assertThrows(ArchiveException.class, () -> ZipFile.builder().setByteArray(data).get());
     }
 }