gh-154481: Fix reading multi-frame Zstandard members in zipfile#154537
Open
lpyu001 wants to merge 1 commit into
Open
gh-154481: Fix reading multi-frame Zstandard members in zipfile#154537lpyu001 wants to merge 1 commit into
lpyu001 wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fix
zipfilereading of Zstandard-compressed archive members containing multiple concatenated frames.ZstdDecompressorintentionally stops after one frame and stores any remaining compressed input inunused_data.ZipExtFilepreviously treated the decompressor'seofstate as the end of the entire ZIP member. As a result, later frames were ignored, which could truncate the returned data or cause an incorrect CRC-32 error.Fix
When a Zstandard frame ends,
ZipExtFilenow:unused_data.ZstdDecompressorfor the next frame.unused_data, or reads more compressed data when the frame boundary falls between archive reads.This keeps the single-frame semantics of
ZstdDecompressorunchanged and handles concatenated frames at thezipfilestreaming layer.Tests
The regression test creates a valid Zstandard-compressed ZIP member containing two frames and covers: