Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make extracting zipfiles more resilient against invalid characters in filenames

Browse Source 
The previous check applied to actual files but not directories
This commit is contained in:
Kovid Goyal 2020-10-16 19:36:26 +05:30
parent c14c232b33
commit 72b3993fca
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/utils/zipfile.py
View File

@ -1155,7 +1155,11 @@ class ZipFile:
if member.filename[-1] == '/': if member.filename[-1] == '/':
if not os.path.isdir(targetpath): if not os.path.isdir(targetpath):
os.mkdir(targetpath) try:
os.mkdir(targetpath)
except Exception: # Added by Kovid
targetpath = os.path.join(base_target, sanitize_file_name(fname))
os.mkdir(targetpath)
self.extract_mapping[member.filename] = targetpath self.extract_mapping[member.filename] = targetpath
return targetpath return targetpath