From 1f7196dade413eac8314f2eac138835e55c1513e Mon Sep 17 00:00:00 2001 From: Martin Mirchev Date: Wed, 18 Nov 2026 09:34:04 +0800 Subject: [PATCH] COMPRESS-737: Check each folder's own CRC flag when sanity-checking SubStreamsInfo sanityCheckSubStreamsInfo() advanced its folder index only when the earlier conditions did not short-circuit, so after a folder with more than one substream it read the CRC flag of the previous folder and a valid archive was rejected with "Badly terminated SubStreamsInfo". Advance the index once per folder. Assisted-By: Claude Code:claude-opus-5-5 --- .../compress/archivers/sevenz/SevenZFile.java | 3 ++- .../archivers/sevenz/SevenZFileTest.java | 18 ++++++++++++++++++ src/test/resources/COMPRESS-737.7z | Bin 0 -> 141 bytes 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/COMPRESS-737.7z 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 0000000000000000000000000000000000000000..cef76ac3e2352e146bc2186e223148a9b8239de6 GIT binary patch literal 141 zcmXr7+Ou9=hJoc_zHK!R0|X>O={!aMD~XAT$;rtnDJe-wNsKIP49uL&Y|ISo+{_G& zj8Mb_6yai6pj*uTf%kl>0|N&yBNHPhGZ*9ACA;-`HeUSAz`)8PsK}5Ah71hJV93Cb N0)`9>Nni-F699$b8BPEI literal 0 HcmV?d00001