diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java index 13815063100..1aaf57fdb68 100644 --- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java +++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java @@ -2202,9 +2202,10 @@ private void sanityCheckSubStreamsInfo(final ByteBuffer header, final ArchiveSta } else { int folderIdx = 0; for (final int numUnpackSubStreams : numUnpackSubStreamsPerFolder) { - if (numUnpackSubStreams != 1 || stats.folderHasCrc == null || !stats.folderHasCrc.get(folderIdx++)) { + if (numUnpackSubStreams != 1 || stats.folderHasCrc == null || !stats.folderHasCrc.get(folderIdx)) { numDigests = accumulate(numDigests, numUnpackSubStreams, "numDigests"); } + folderIdx++; } } if (nid == NID.kCRC) { diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java index 67efd10806a..dd7c7d38af0 100644 --- a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java @@ -1260,4 +1260,22 @@ void testSignatureCheck() { final byte[] data3 = { '7', 'z', (byte) 0xBC, (byte) 0xAF, 0x27, 0x1D }; assertFalse(SevenZFile.matches(data3, data3.length)); } + + /** + * Tests an archive whose folders are, in this order, one entry with a folder CRC, two entries without, and one entry with a folder CRC. + */ + @Test + void testMixedFolderCrcs() throws Exception { + try (SevenZFile sevenZFile = getSevenZFile("COMPRESS-737.7z")) { + final List names = new ArrayList<>(); + final List contents = new ArrayList<>(); + SevenZArchiveEntry entry; + while ((entry = sevenZFile.getNextEntry()) != null) { + names.add(entry.getName()); + contents.add(new String(IOUtils.toByteArray(sevenZFile.getInputStream(entry)), UTF_8)); + } + assertEquals(Arrays.asList("aaa", "ccc", "ddd", "bbb"), names); + assertEquals(names, contents); + } + } } diff --git a/src/test/resources/COMPRESS-737.7z b/src/test/resources/COMPRESS-737.7z new file mode 100644 index 00000000000..cef76ac3e23 Binary files /dev/null and b/src/test/resources/COMPRESS-737.7z differ