gh-84481: Make ZipFile.data_offset more robust #132178
Merged
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
e7ef220 to
e6c5a9f
Compare
picnixz
reviewed
Apr 6, 2025
picnixz
approved these changes
Apr 8, 2025
seehwan
pushed a commit
to seehwan/cpython
that referenced
this pull request
Apr 16, 2025
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jul 21, 2025
* Revert "pythongh-84481: Make ZipFile.data_offset more robust (pythonGH-132178)" This reverts commit 6cd1d6c. * Revert "pythongh-84481: Add ZipFile.data_offset attribute (pythonGH-132165)" This reverts commit 0788948. --------- (cherry picked from commit 6bf1c0a) Co-authored-by: Emma Smith <emma@emmatyping.dev> Co-authored-by: Gregory P. Smith <greg@krypto.org>
gpshead
added a commit
that referenced
this pull request
Jul 22, 2025
…36955) gh-136170: Revert adding `ZipFile.data_offset` (GH-136950) * Revert "gh-84481: Make ZipFile.data_offset more robust (GH-132178)" This reverts commit 6cd1d6c. * Revert "gh-84481: Add ZipFile.data_offset attribute (GH-132165)" This reverts commit 0788948. --------- (cherry picked from commit 6bf1c0a) Co-authored-by: Emma Smith <emma@emmatyping.dev> Co-authored-by: Gregory P. Smith <greg@krypto.org>
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.
As pointed out by @picnixz, in append mode with a bad zip file, we append to the end of the file, and should set
.data_offset.I also added a test which should cover this scenario.