diff --git a/.gitignore b/.gitignore
index 92a0cd4efac..560a200e591 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ target
/.externalToolBuilders/
/maven-eclipse.xml
/.java-version
+/.checkstyle
# NetBeans files
nb-configuration.xml
diff --git a/src/conf/checkstyle/checkstyle.xml b/src/conf/checkstyle/checkstyle.xml
index 83dc97197f5..7e8923a4477 100644
--- a/src/conf/checkstyle/checkstyle.xml
+++ b/src/conf/checkstyle/checkstyle.xml
@@ -26,7 +26,7 @@ limitations under the License.
-
+
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index d24048786a3..a718304b842 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -838,7 +838,7 @@ public ZipArchiveEntry getNextZipEntry() throws IOException {
}
final ZipLong sig = new ZipLong(lfhBuf);
if (!sig.equals(ZipLong.LFH_SIG)) {
- if (sig.equals(ZipLong.CFH_SIG) || sig.equals(ZipLong.AED_SIG) || isApkSigningBlock(lfhBuf)) {
+ if (sig.equals(ZipLong.CFH_SIG) || sig.equals(ZipLong.AED_SIG) || isApkSigningBlock(lfhBuf) || sig.equals(ZipLong.ZERO)) {
hitCentralDirectory = true;
skipRemainderOfArchive();
return null;
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
index b8e0e7cedc6..cc996c1eb56 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
@@ -50,6 +50,8 @@ public final class ZipLong implements Cloneable, Serializable {
*/
public static final ZipLong DD_SIG = new ZipLong(0X08074B50L);
+ static final ZipLong ZERO = new ZipLong(0);
+
/**
* Value stored in size and similar fields if ZIP64 extensions are used.
*
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipCompress715Test.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipCompress715Test.java
new file mode 100644
index 00000000000..2439f9ba14b
--- /dev/null
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipCompress715Test.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.commons.compress.archivers.zip;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.util.zip.CRC32;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.function.IOConsumer;
+import org.apache.commons.io.input.ChecksumInputStream;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests https://issues.apache.org/jira/browse/COMPRESS-715
+ */
+class ZipCompress715Test {
+
+ private void assertNextEntry(final ZipArchiveInputStream inputStream, final String expectedName, final int expectedSize, final String expectedCrcRadix16)
+ throws IOException {
+ final ZipArchiveEntry nextEntry = inputStream.getNextEntry();
+ assertEquals(expectedName, nextEntry.getName());
+ assertEquals(expectedSize, nextEntry.getSize());
+ final long crc = nextEntry.getCrc();
+ final long expectedCrc = Long.parseUnsignedLong(expectedCrcRadix16, 16);
+ assertEquals(expectedCrc, crc, () -> String.format("0x%x", crc));
+ // @formatter:off
+ @SuppressWarnings("resource")
+ final ChecksumInputStream checksum = ChecksumInputStream.builder()
+ .setInputStream(inputStream)
+ .setChecksum(new CRC32())
+ .setExpectedChecksumValue(expectedCrc)
+ .setCountThreshold(expectedSize)
+ .get();
+ // @formatter:on
+ IOUtils.consume(checksum);
+ }
+
+ /**
+ * The test fixture unzips OK using {@code UnZip 6.00 of 20 April 2009, by Info-ZIP, with modifications by Apple Inc.}
+ *
+ *
+ * Running:
+ *
+ *
+ * unzip -lv compress715.zip
+ *
+ *
+ * returns:
+ *
+ *
+ *
+ * Archive: compress715.zip
+ * Length Method Size Cmpr Date Time CRC-32 Name
+ * -------- ------ ------- ---- ---------- ----- -------- ----
+ * 341552 Defl:N 14034 96% 03-18-2024 21:36 88cbd694 50700006_82901717_20240318�?162450_Speichergruppe-14_Monitoring_AMT_M5190M_12394_986197575850.mf4
+ * 641560 Defl:N 49549 92% 03-18-2024 21:36 ef0dba37 50700006_82901717_20240318�?162450_Speichergruppe-11_Monitoring_CAN_M5190M_7651_986197575850.mf4
+ * 37280 Defl:X 36887 1% 03-18-2024 21:36 ba89ba80 50700006_82901717_20240318�?162450_MEA_5190.dmp
+ * 405692 Defl:X 371118 9% 03-18-2024 21:24 1e1402e5 50700006_82901717_20240318�?162450_CFG_5190.ilf
+ * 847104 Defl:X 812041 4% 03-18-2024 21:24 d0b8c08d 50700006_82901717_20240318�?162450_CFG_5190.zip
+ * 11107 Defl:X 2764 75% 03-18-2024 21:36 bb2f0f57 50700006_82901717_20240318�?162450_MEA_5190.LOG
+ * -------- ------- --- -------
+ * 2284295 1286393 44% 6 files
+ *
+ *
+ * @throws IOException Thrown if the test fails.
+ */
+ @Test
+ void testCompress715() throws IOException {
+ final String fixture = "src/test/resources/org/apache/commons/compress/COMPRESS-715/compress715.zip";
+ try (ZipArchiveInputStream inputStream = ZipArchiveInputStream.builder().setPath(fixture).get()) {
+ inputStream.forEach(IOConsumer.noop());
+ }
+ try (ZipArchiveInputStream inputStream = ZipArchiveInputStream.builder().setPath(fixture).get()) {
+ assertNextEntry(inputStream, "50700006_82901717_20240318–162450_Speichergruppe-14_Monitoring_AMT_M5190M_12394_986197575850.mf4", 341_552, "88cbd694");
+ assertNextEntry(inputStream, "50700006_82901717_20240318–162450_Speichergruppe-11_Monitoring_CAN_M5190M_7651_986197575850.mf4", 641_560, "ef0dba37");
+ assertNextEntry(inputStream, "50700006_82901717_20240318–162450_MEA_5190.dmp", 37_280, "ba89ba80");
+ assertNextEntry(inputStream, "50700006_82901717_20240318–162450_CFG_5190.ilf", 405_692, "1e1402e5");
+ assertNextEntry(inputStream, "50700006_82901717_20240318–162450_CFG_5190.zip", 847_104, "d0b8c08d");
+ assertNextEntry(inputStream, "50700006_82901717_20240318–162450_MEA_5190.LOG", 11_107, "bb2f0f57");
+ assertNull(inputStream.getNextEntry());
+ }
+ }
+}
diff --git a/src/test/resources/org/apache/commons/compress/COMPRESS-715/compress715.zip b/src/test/resources/org/apache/commons/compress/COMPRESS-715/compress715.zip
new file mode 100644
index 00000000000..ef55fe455a7
Binary files /dev/null and b/src/test/resources/org/apache/commons/compress/COMPRESS-715/compress715.zip differ