Skip to content

gh-98286: handle empty filename in ZipFile/ZipInfo properly #98346

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

Merged
gpshead merged 1 commit into from
Oct 29, 2022
Merged

gh-98286: handle empty filename in ZipFile/ZipInfo properly #98346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Lib/zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ def from_file(cls, filename, arcname=None, *, strict_timestamps=True):

def is_dir(self):
"""Return True if this archive member is a directory."""
return self.filename[-1] == '/'
return self.filename.endswith('/')


# ZIP encryption uses the CRC32 one-byte primitive for scrambling some
Expand Down Expand Up @@ -1731,6 +1731,9 @@ def _extract_member(self, member, targetpath, pwd):
# filter illegal characters on Windows
arcname = self._sanitize_windows_name(arcname, os.path.sep)

if not arcname:
raise ValueError("Empty filename.")

targetpath = os.path.join(targetpath, arcname)
targetpath = os.path.normpath(targetpath)

Expand Down Expand Up @@ -1820,7 +1823,7 @@ def writestr(self, zinfo_or_arcname, data,
date_time=time.localtime(time.time())[:6])
zinfo.compress_type = self.compression
zinfo._compresslevel = self.compresslevel
if zinfo.filename[-1] == '/':
if zinfo.filename.endswith('/'):
zinfo.external_attr = 0o40775 << 16 # drwxrwxr-x
zinfo.external_attr |= 0x10 # MS-DOS directory flag
else:
Expand Down