summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Facioni <fran6co@gmail.com>2019-05-28 23:15:11 (GMT)
committerCheryl Sabella <cheryl.sabella@gmail.com>2019-05-28 23:15:11 (GMT)
commitab0716ed1ea2957396054730afbb80c1825f9786 (patch)
tree529b5572bc9527abd7fb858e1fc32c841d6c85ce
parent33ce3f012f249782507df896824b045b34f765aa (diff)
downloadcpython-ab0716ed1ea2957396054730afbb80c1825f9786.zip
cpython-ab0716ed1ea2957396054730afbb80c1825f9786.tar.gz
cpython-ab0716ed1ea2957396054730afbb80c1825f9786.tar.bz2
bpo-22102: Fixes zip files with disks set to 0 (GH-5985)
-rw-r--r--Lib/zipfile.py2
-rw-r--r--Misc/NEWS.d/next/Library/2018-03-08-16-15-00.bpo-22102.th33uD.rst2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 8f8cb86..5496f6e 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -226,7 +226,7 @@ def _EndRecData64(fpin, offset, endrec):
if sig != stringEndArchive64Locator:
return endrec
- if diskno != 0 or disks != 1:
+ if diskno != 0 or disks > 1:
raise BadZipFile("zipfiles that span multiple disks are not supported")
# Assume no 'zip64 extensible data'
diff --git a/Misc/NEWS.d/next/Library/2018-03-08-16-15-00.bpo-22102.th33uD.rst b/Misc/NEWS.d/next/Library/2018-03-08-16-15-00.bpo-22102.th33uD.rst
new file mode 100644
index 0000000..ad690f5
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-03-08-16-15-00.bpo-22102.th33uD.rst
@@ -0,0 +1,2 @@
+Added support for ZIP files with disks set to 0. Such files are commonly created by builtin tools on Windows when use ZIP64 extension.
+Patch by Francisco Facioni.