[Python-checkins] gh-98286: handle empty filename in ZipFile/ZipInfo properly (#98346)
gpshead
webhook-mailer at python.org
Sat Oct 29 01:46:06 EDT 2022
https://github.com/python/cpython/commit/7ea10567afe38e7770e82b4642c0b01659acaad5
commit: 7ea10567afe38e7770e82b4642c0b01659acaad5
branch: main
author: FC Stegerman <flx at obfusk.net>
committer: gpshead <greg at krypto.org>
date: 2022-10-28T22:45:46-07:00
summary:
gh-98286: handle empty filename in ZipFile/ZipInfo properly (#98346)
effectively code modernization and a meaningful exception.
files:
M Lib/zipfile.py
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index b6465373c107..77b643caf9fc 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -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
@@ -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)
@@ -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:
More information about the Python-checkins
mailing list