GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-88233: zipfile: handle extras after a zip64 extra by thatch · Pull Request #96161 · python/cpython

Conversation

@thatch

@thatch thatch commented Aug 21, 2022 •
edited by miss-islington
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Contributor

Previously, any data after the zip64 extra would be removed.

With many new tests.

Fixes #88233

  • Issue: Zipfile lib overwrites the extra field during closing when the archive size is more then ZIP64_LIMIT #88233

Automerge-Triggered-By: GH:jaraco

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@bedevere-bot bedevere-bot added the awaiting review label Aug 21, 2022
gpshead
gpshead approved these changes Aug 25, 2022
View reviewed changes
@bedevere-bot bedevere-bot added awaiting merge and removed awaiting review labels Aug 25, 2022
@gpshead gpshead added needs backport to 3.10 needs backport to 3.11 only security fixes labels Aug 25, 2022
@gpshead

gpshead commented Aug 25, 2022

Copy link
Copy Markdown
Member

Can you add a NEWS entry (https://pypi.org/project/blurb/ can help) describing the bugfix?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

thatch added 2 commits September 5, 2022 12:18
@thatch
zipfile: handle extras after a zip64 extra
a263718
Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes python#88233
@thatch
Add NEWS entry for bugfix
f995644
@thatch
thatch force-pushed the issue88233 branch from e4a6896 to f995644 Compare September 5, 2022 19:19
@thatch

thatch commented Sep 5, 2022

Copy link
Copy Markdown
Contributor Author

Rebased and NEWS entry added.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@thatch

thatch commented Sep 25, 2022

Copy link
Copy Markdown
Contributor Author

@gpshead would you like me to do anything else on this one? NEWS entry is added.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@kumaraditya303 kumaraditya303 assigned gpshead Sep 25, 2022
@thatch

thatch commented Nov 5, 2022

Copy link
Copy Markdown
Contributor Author

@gpshead any other changes you'd like to see on this one?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@smontanaro

smontanaro commented Nov 22, 2022

Copy link
Copy Markdown
Contributor

(I'm working my way through some PRs which have been approved and are labeled "awaiting merge", hence my seemingly bolt from the blue comment. Why? Read here.)

Looks like this is complete. Can someone merge it so it doesn't get too stale?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@arhadthedev
Merge branch 'main' into issue88233
105321c
@bedevere-bot bedevere-bot mentioned this pull request Feb 5, 2023
Zipfile lib overwrites the extra field during closing when the archive size is more then ZIP64_LIMIT #88233
Closed
@arhadthedev

arhadthedev commented Feb 5, 2023

Copy link
Copy Markdown
Member

@gpshead (as the zipfile expert), would you mind to review and possibly merge this PR?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@gpshead
gpshead requested a review from jaraco February 5, 2023 19:50
@gpshead

gpshead commented Feb 5, 2023

Copy link
Copy Markdown
Member

This one is likely good, @jaraco is our real zipfile expert though. looping him in before merging.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

jaraco added 4 commits February 20, 2023 11:28
@jaraco
Fix typo
9c58352
@jaraco
Tweak style to conform to best conventions. Remove unused variable.
72f6e4d
@jaraco
Reflow comment to 72 characters per PEP 8.
b1dad59
@jaraco
Replace literal and ambiguous comment with a self-documenting constant.
61ad114
jaraco
jaraco approved these changes Feb 20, 2023
View reviewed changes

@jaraco jaraco left a comment

Copy link
Copy Markdown
Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I had some minor nitpicks with the test, so took the liberty to correct those. I also replaced the literal 1 with ZIP64_EXTRA in the hopes of more clearly communicating that aspect.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@jaraco
Merge branch 'main' into issue88233
a26edf1
@jaraco jaraco added the 🤖 automerge label Feb 20, 2023
@jaraco jaraco mentioned this pull request Feb 20, 2023
gh-88233: zipfile: refactor _strip_extra #102084
Merged
@miss-islington

miss-islington commented Feb 20, 2023

Copy link
Copy Markdown
Contributor

Status check is done, and it's a success ✅.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@miss-islington
miss-islington merged commit 59e86ca into python:main Feb 20, 2023
@miss-islington

miss-islington commented Feb 20, 2023

Copy link
Copy Markdown
Contributor

Thanks @thatch for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-bot bedevere-bot removed the awaiting merge label Feb 20, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 20, 2023
@thatch @miss-islington
pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-…
8efac30
…96161)

Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes pythonGH-88233
(cherry picked from commit 59e86ca)

Co-authored-by: Tim Hatch <[email protected]>
Automerge-Triggered-By: GH:jaraco
@bedevere-bot

bedevere-bot commented Feb 20, 2023

Copy link
Copy Markdown

GH-102086 is a backport of this pull request to the 3.11 branch.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Feb 20, 2023
@bedevere-bot

bedevere-bot commented Feb 20, 2023

Copy link
Copy Markdown

GH-102087 is a backport of this pull request to the 3.10 branch.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 label Feb 20, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 20, 2023
@thatch @miss-islington
pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-…
0959162
…96161)

Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes pythonGH-88233
(cherry picked from commit 59e86ca)

Co-authored-by: Tim Hatch <[email protected]>
Automerge-Triggered-By: GH:jaraco
miss-islington added a commit that referenced this pull request Feb 20, 2023
@miss-islington @thatch
gh-88233: zipfile: handle extras after a zip64 extra (GH-96161)
62c0327
Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes GH-88233
(cherry picked from commit 59e86ca)

Co-authored-by: Tim Hatch <[email protected]>
Automerge-Triggered-By: GH:jaraco
carljm added a commit to carljm/cpython that referenced this pull request Feb 20, 2023
@carljm
Merge branch 'main' into inlinecomp2
9f0fc5b
* main: (60 commits)
  pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078)
  pythongh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (python#102012)
  pythongh-101566: Sync with zipp 3.14. (pythonGH-102018)
  pythonGH-99818: improve the documentation for zipfile.Path and Traversable (pythonGH-101589)
  pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-96161)
  pythongh-101981: Apply HOMEBREW related environment variables (pythongh-102074)
  pythongh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros (pythonGH-101912)
  pythongh-101819: Adapt _io types to heap types, batch 1 (pythonGH-101949)
  pythongh-101981: Build macOS as recommended by the devguide (pythonGH-102070)
  pythongh-97786: Fix compiler warnings in pytime.c (python#101826)
  pythongh-101578: Amend PyErr_{Set,Get}RaisedException docs (python#101962)
  Misc improvements to the float tutorial (pythonGH-102052)
  pythongh-85417: Clarify behaviour on branch cuts in cmath module (python#102046)
  pythongh-100425: Update tutorial docs related to sum() accuracy (FH-101854)
  Add missing 'is' to `cmath.log()` docstring (python#102049)
  pythongh-100210: Correct the comment link for unescaping HTML (python#100212)
  pythongh-97930: Also include subdirectory in makefile. (python#102030)
  pythongh-99735: Use required=True in argparse subparsers example (python#100927)
  Fix incorrectly documented attribute in csv docs (python#101250)
  pythonGH-84783: Make the slice object hashable (pythonGH-101264)
  ...
carljm added a commit to carljm/cpython that referenced this pull request Feb 22, 2023
@carljm
Merge branch 'main' into inlinecomp
544b30c
* main: (225 commits)
  pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078)
  pythongh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (python#102012)
  pythongh-101566: Sync with zipp 3.14. (pythonGH-102018)
  pythonGH-99818: improve the documentation for zipfile.Path and Traversable (pythonGH-101589)
  pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-96161)
  pythongh-101981: Apply HOMEBREW related environment variables (pythongh-102074)
  pythongh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros (pythonGH-101912)
  pythongh-101819: Adapt _io types to heap types, batch 1 (pythonGH-101949)
  pythongh-101981: Build macOS as recommended by the devguide (pythonGH-102070)
  pythongh-97786: Fix compiler warnings in pytime.c (python#101826)
  pythongh-101578: Amend PyErr_{Set,Get}RaisedException docs (python#101962)
  Misc improvements to the float tutorial (pythonGH-102052)
  pythongh-85417: Clarify behaviour on branch cuts in cmath module (python#102046)
  pythongh-100425: Update tutorial docs related to sum() accuracy (FH-101854)
  Add missing 'is' to `cmath.log()` docstring (python#102049)
  pythongh-100210: Correct the comment link for unescaping HTML (python#100212)
  pythongh-97930: Also include subdirectory in makefile. (python#102030)
  pythongh-99735: Use required=True in argparse subparsers example (python#100927)
  Fix incorrectly documented attribute in csv docs (python#101250)
  pythonGH-84783: Make the slice object hashable (pythonGH-101264)
  ...
ambv pushed a commit that referenced this pull request Mar 28, 2023
@miss-islington @thatch
[3.10] gh-88233: zipfile: handle extras after a zip64 extra (GH-96161) (
d445147
#102087)

Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes GH-88233
(cherry picked from commit 59e86ca)

Co-authored-by: Tim Hatch <[email protected]>
python-sidebar pushed a commit to python-sidebar/Python-Documentation-Fork-With-TOC that referenced this pull request Sep 1, 2024
@thatch @python-sidebar
pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-…
12d27d8
…96161)

Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes python#88233

Automerge-Triggered-By: GH:jaraco
python-sidebar pushed a commit to python-sidebar/Python-Documentation-Fork-With-TOC that referenced this pull request Sep 1, 2024
@thatch @python-sidebar
pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-…
676b772
…96161)

Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes python#88233

Automerge-Triggered-By: GH:jaraco
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gpshead gpshead gpshead approved these changes
@jaraco jaraco jaraco approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

@gpshead gpshead

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Zipfile lib overwrites the extra field during closing when the archive size is more then ZIP64_LIMIT

Uh oh!

There was an error while loading. Please reload this page.

7 participants

@thatch @gpshead @smontanaro @arhadthedev @miss-islington @bedevere-bot @jaraco
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.