Skip to content

gh-83245: Raise BadZipFile instead of ValueError when reading a corrupt file #32291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
serhiy-storchaka merged 11 commits into from
May 23, 2022
Merged

gh-83245: Raise BadZipFile instead of ValueError when reading a corrupt file #32291

serhiy-storchaka merged 11 commits into from
May 23, 2022

Conversation

@dignissimus
Copy link
Contributor

@dignissimus dignissimus commented Apr 3, 2022 •
edited
Loading

@dignissimus dignissimus changed the title bpo-30964: Raise BadZipFile isntead of ValueError when reading a corrupt file bpo-39064: Raise BadZipFile isntead of ValueError when reading a corrupt file Apr 3, 2022
iritkatriel
iritkatriel reviewed Apr 4, 2022
View reviewed changes
@dignissimus @iritkatriel
Update Lib/zipfile.py
f73ebec 
Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
@dignissimus dignissimus changed the title bpo-39064: Raise BadZipFile isntead of ValueError when reading a corrupt file bpo-39064: Raise BadZipFile instead of ValueError when reading a corrupt file Apr 4, 2022
@dignissimus dignissimus changed the title bpo-39064: Raise BadZipFile instead of ValueError when reading a corrupt file gh-83245: Raise BadZipFile instead of ValueError when reading a corrupt file Apr 14, 2022
MaxwellDupre
MaxwellDupre approved these changes Apr 23, 2022
View reviewed changes
Copy link
Contributor

@MaxwellDupre MaxwellDupre left a comment

Choose a reason for hiding this comment

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

Ran 258 tests in 59.938s
OK (skipped=1)
Looks ok.

serhiy-storchaka
serhiy-storchaka reviewed Apr 23, 2022
View reviewed changes
Copy link
Member

@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

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

LGTM in general, but I have few nitpicks.

dignissimus and others added 4 commits April 23, 2022 13:09
@dignissimus @serhiy-storchaka
Use byte-strings to write malformed zipfile
a26de91 
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@dignissimus @serhiy-storchaka
Remove rendundant call to bytes
4e35837 
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@dignissimus @serhiy-storchaka
Update news entry
ab1afb0 
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@dignissimus
Use offset value to determine whether to raise BadZipFile
bf8d167
@jvoisin jvoisin mannequin mentioned this pull request Apr 10, 2022
Closed
serhiy-storchaka
serhiy-storchaka reviewed May 23, 2022
View reviewed changes
@dignissimus @serhiy-storchaka
Run BadZipFile test for all 32 bit central directory record sizes
f0ee1c7 
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@serhiy-storchaka serhiy-storchaka merged commit 202ed25 into python:main May 23, 2022
@serhiy-storchaka serhiy-storchaka added type-bug An unexpected behavior, bug, or error needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels May 23, 2022
@miss-islington
Copy link
Contributor

miss-islington commented May 23, 2022

Thanks @dignissimus for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented May 23, 2022

Thanks @dignissimus for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@bedevere-bot
Copy link

bedevere-bot commented May 23, 2022

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

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label May 23, 2022
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 23, 2022
@dignissimus @miss-islington
pythongh-83245: Raise BadZipFile instead of ValueError when reading a…
2c7dc29 
… corrupt ZIP file (pythonGH-32291)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
(cherry picked from commit 202ed25)

Co-authored-by: Sam Ezeh <sam.z.ezeh@gmail.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 23, 2022
@dignissimus @miss-islington
pythongh-83245: Raise BadZipFile instead of ValueError when reading a…
0683c5a 
… corrupt ZIP file (pythonGH-32291)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
(cherry picked from commit 202ed25)

Co-authored-by: Sam Ezeh <sam.z.ezeh@gmail.com>
@bedevere-bot
Copy link

bedevere-bot commented May 23, 2022

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

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label May 23, 2022
miss-islington added a commit that referenced this pull request May 25, 2022
@miss-islington
[3.11] gh-83245: Raise BadZipFile instead of ValueError when reading …
e9d6ca4 
…a corrupt ZIP file (GH-32291) (GH-93141)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
(cherry picked from commit 202ed25)


Co-authored-by: Sam Ezeh <sam.z.ezeh@gmail.com>

Automerge-Triggered-By: GH:serhiy-storchaka
miss-islington added a commit that referenced this pull request May 25, 2022
@miss-islington
[3.10] gh-83245: Raise BadZipFile instead of ValueError when reading …
132ea29 
…a corrupt ZIP file (GH-32291) (GH-93140)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
(cherry picked from commit 202ed25)


Co-authored-by: Sam Ezeh <sam.z.ezeh@gmail.com>

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

Reviewers

@iritkatriel iritkatriel iritkatriel left review comments

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

+1 more reviewer

@MaxwellDupre MaxwellDupre MaxwellDupre approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@dignissimus @miss-islington @bedevere-bot @iritkatriel @serhiy-storchaka @MaxwellDupre @the-knights-who-say-ni