gh-153679: Raise ZipImportError for an invalid UTF-8 file name in zipimport#153680
Open
tonghuaroot wants to merge 2 commits into
Open
gh-153679: Raise ZipImportError for an invalid UTF-8 file name in zipimport#153680tonghuaroot wants to merge 2 commits into
tonghuaroot wants to merge 2 commits into
Conversation
…in zipimport zipimport.zipimporter() is documented to raise ZipImportError for an invalid archive, but _read_directory() leaked a raw UnicodeDecodeError when a central directory entry set the UTF-8 file name flag (0x800) but stored bytes that are not valid UTF-8: the UTF-8 branch called name.decode() unguarded, while the sibling non-UTF-8 branch already handles UnicodeDecodeError. Guard the UTF-8 decode and raise ZipImportError instead.
tonghuaroot
requested review from
FFY00,
brettcannon,
ericsnowcurrently,
ncoghlan and
warsaw
as code owners
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.
zipimport.zipimporter()is documented to raiseZipImportErrorfor aninvalid archive, but
_read_directory()leaked a rawUnicodeDecodeErrorwhen a central directory entry set the UTF-8 file name flag (
0x800) butstored bytes that are not valid UTF-8: the UTF-8 branch called
name.decode()unguarded, while the sibling non-UTF-8 branch already handles
UnicodeDecodeError.Guard the UTF-8 decode and raise
ZipImportError, matching the documentedcontract and every other corruption path in the function.