gh-155639: Reject ZIP files with inconsistent EOCD disk information - #155814
Draft
abdulm5 wants to merge 1 commit into
Draft
gh-155639: Reject ZIP files with inconsistent EOCD disk information#155814abdulm5 wants to merge 1 commit into
abdulm5 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
1 participant
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.
Fixes #155639.
zipfiledoes not support multi-disk archives, but its end of centraldirectory parser accepted archives whose disk fields were inconsistent with
a single-disk archive.
Validate the classic EOCD disk fields before ZIP64 resolution, permitting the
0xFFFFZIP64 sentinel, and require the resolved classic or ZIP64 values toidentify disk zero. This makes
ZipFilereject the malformed archive andkeeps
is_zipfile()consistent while preserving the position of file-likeinputs.
Regression tests cover classic EOCD records with and without comments, ZIP64
EOCD records, malformed classic fields followed by valid ZIP64 metadata, and
valid ZIP64 sentinel fields.
Tests:
./python.exe -m test test_zipfile(594 tests run, 3 skipped)-R 3:3)