]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
TODO seems to have been addressed; remove
authorTim Kientzle <kientzle@acm.org>
Thu, 7 May 2026 16:45:17 +0000 (09:45 -0700)
committerTim Kientzle <kientzle@acm.org>
Thu, 7 May 2026 16:45:17 +0000 (09:45 -0700)
libarchive/archive_read_support_format_7zip.c

index 517f60b603b67f63b41b3c6815a20b8a956f8281..1e8f529743bb9014ab18badc0bffbb27bc2cff80 100644 (file)
@@ -1189,17 +1189,6 @@ archive_read_format_7zip_read_data_skip(struct archive_read *a)
         * compressed data much more quickly.
         */
        bytes_skipped = skip_stream(a, (size_t)zip->entry_bytes_remaining);
-       /*
-        * TODO: when archive_read_data() fails on an encrypted entry with
-        * ARCHIVE_FAILED, the implicit skip from the next
-        * archive_read_next_header() lands here.  Empirically, skip_stream()
-        * still returns ARCHIVE_FATAL via extract_pack_stream() on its second
-        * call (after setup_decode_folder() returned ARCHIVE_FAILED on the
-        * first), so the FAILED-from-data / FATAL-from-skip asymmetry persists.
-        * Audit extract_pack_stream() / read_stream() to see whether the second
-        * call should also surface ARCHIVE_FAILED so the caller can move on
-        * to entries in subsequent folders.
-        */
        if (bytes_skipped < 0)
                return ((int)bytes_skipped);
        zip->entry_bytes_remaining = 0;