diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-09-17 06:11:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 06:11:42 -0700 |
| commit | 83a0985165abf340294c10d732840e9d46ba218c (patch) | |
| tree | 2eed0286caf4ec50f221037f5afbd241c269b964 /Lib/zipfile.py | |
| parent | 1e7193bd027a5a4aa1a387e3f201a3e465c25f01 (diff) | |
| download | cpython-git-83a0985165abf340294c10d732840e9d46ba218c.tar.gz | |
bpo-34341: Fix appending to ZIP archives with the ZIP64 extension. (GH-8683)
(cherry picked from commit 9bdb7be482aef8f60daa1d36606568a132dcb616)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Lib/zipfile.py')
| -rw-r--r-- | Lib/zipfile.py | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 9164f8ab08..bc757a37b5 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -164,6 +164,27 @@ _CD64_NUMBER_ENTRIES_TOTAL = 7 _CD64_DIRECTORY_SIZE = 8 _CD64_OFFSET_START_CENTDIR = 9 +_EXTRA_FIELD_STRUCT = struct.Struct('<HH') + +def _strip_extra(extra, xids): + # Remove Extra Fields with specified IDs. + unpack = _EXTRA_FIELD_STRUCT.unpack + modified = False + buffer = [] + start = i = 0 + while i + 4 <= len(extra): + xid, xlen = unpack(extra[i : i + 4]) + j = i + 4 + xlen + if xid in xids: + if i != start: + buffer.append(extra[start : i]) + start = j + modified = True + i = j + if not modified: + return extra + return b''.join(buffer) + def _check_zipfile(fp): try: if _EndRecData(fp): @@ -1710,6 +1731,7 @@ class ZipFile: min_version = 0 if extra: # Append a ZIP64 field to the extra's + extra_data = _strip_extra(extra_data, (1,)) extra_data = struct.pack( '<HH' + 'Q'*len(extra), 1, 8*len(extra), *extra) + extra_data |