mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Revert bpo-26293 for zipfile breakage. See also bpo-29094. (#1484)

Browse source
This commit is contained in:
Serhiy Storchaka 2017-05-06 14:46:01 +03:00 • committed by GitHub
parent a12df7b7d4
commit 3763ea865c
2 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Lib/zipfile.py
View file

@ -1109,7 +1109,6 @@ class ZipFile:
# set the modified flag so central directory gets written # set the modified flag so central directory gets written
# even if no files are added to the archive # even if no files are added to the archive
self._didModify = True self._didModify = True
self._start_disk = 0
try: try:
self.start_dir = self.fp.tell() self.start_dir = self.fp.tell()
except (AttributeError, OSError): except (AttributeError, OSError):
@ -1135,7 +1134,7 @@ class ZipFile:
# set the modified flag so central directory gets written # set the modified flag so central directory gets written
# even if no files are added to the archive # even if no files are added to the archive
self._didModify = True self._didModify = True
self.start_dir = self._start_disk = self.fp.tell() self.start_dir = self.fp.tell()
else: else:
raise ValueError("Mode must be 'r', 'w', 'x', or 'a'") raise ValueError("Mode must be 'r', 'w', 'x', or 'a'")
except: except:
@ -1179,18 +1178,17 @@ class ZipFile:
offset_cd = endrec[_ECD_OFFSET] # offset of central directory offset_cd = endrec[_ECD_OFFSET] # offset of central directory
self._comment = endrec[_ECD_COMMENT] # archive comment self._comment = endrec[_ECD_COMMENT] # archive comment
# self._start_disk: Position of the start of ZIP archive # "concat" is zero, unless zip was concatenated to another file
# It is zero, unless ZIP was concatenated to another file concat = endrec[_ECD_LOCATION] - size_cd - offset_cd
self._start_disk = endrec[_ECD_LOCATION] - size_cd - offset_cd
if endrec[_ECD_SIGNATURE] == stringEndArchive64: if endrec[_ECD_SIGNATURE] == stringEndArchive64:
# If Zip64 extension structures are present, account for them # If Zip64 extension structures are present, account for them
self._start_disk -= (sizeEndCentDir64 + sizeEndCentDir64Locator) concat -= (sizeEndCentDir64 + sizeEndCentDir64Locator)
if self.debug > 2: if self.debug > 2:
inferred = self._start_disk + offset_cd inferred = concat + offset_cd
print("given, inferred, offset", offset_cd, inferred, self._start_disk) print("given, inferred, offset", offset_cd, inferred, concat)
# self.start_dir: Position of start of central directory # self.start_dir: Position of start of central directory
self.start_dir = offset_cd + self._start_disk self.start_dir = offset_cd + concat
fp.seek(self.start_dir, 0) fp.seek(self.start_dir, 0)
data = fp.read(size_cd) data = fp.read(size_cd)
fp = io.BytesIO(data) fp = io.BytesIO(data)
@ -1230,7 +1228,7 @@ class ZipFile:
t>>11, (t>>5)&0x3F, (t&0x1F) * 2 ) t>>11, (t>>5)&0x3F, (t&0x1F) * 2 )
x._decodeExtra() x._decodeExtra()
x.header_offset = x.header_offset + self._start_disk x.header_offset = x.header_offset + concat
self.filelist.append(x) self.filelist.append(x)
self.NameToInfo[x.filename] = x self.NameToInfo[x.filename] = x
@ -1701,10 +1699,11 @@ class ZipFile:
file_size = zinfo.file_size file_size = zinfo.file_size
compress_size = zinfo.compress_size compress_size = zinfo.compress_size
header_offset = zinfo.header_offset - self._start_disk if zinfo.header_offset > ZIP64_LIMIT:
if header_offset > ZIP64_LIMIT: extra.append(zinfo.header_offset)
extra.append(header_offset)
header_offset = 0xffffffff header_offset = 0xffffffff
else:
header_offset = zinfo.header_offset
extra_data = zinfo.extra extra_data = zinfo.extra
min_version = 0 min_version = 0
@ -1751,7 +1750,7 @@ class ZipFile:
# Write end-of-zip-archive record # Write end-of-zip-archive record
centDirCount = len(self.filelist) centDirCount = len(self.filelist)
centDirSize = pos2 - self.start_dir centDirSize = pos2 - self.start_dir
centDirOffset = self.start_dir - self._start_disk centDirOffset = self.start_dir
requires_zip64 = None requires_zip64 = None
if centDirCount > ZIP_FILECOUNT_LIMIT: if centDirCount > ZIP_FILECOUNT_LIMIT:
requires_zip64 = "Files count" requires_zip64 = "Files count"

7
Misc/NEWS
View file

@ -602,9 +602,6 @@ Library
- Issue #28985: Update authorizer constants in sqlite3 module. - Issue #28985: Update authorizer constants in sqlite3 module.
Patch by Dingyuan Wang. Patch by Dingyuan Wang.
- Issue #29094: Offsets in a ZIP file created with extern file object and modes
"w" and "x" now are relative to the start of the file.
- Issue #29079: Prevent infinite loop in pathlib.resolve() on Windows - Issue #29079: Prevent infinite loop in pathlib.resolve() on Windows
- Issue #13051: Fixed recursion errors in large or resized - Issue #13051: Fixed recursion errors in large or resized
@ -784,10 +781,6 @@ Library
- Issue #28317: The disassembler now decodes FORMAT_VALUE argument. - Issue #28317: The disassembler now decodes FORMAT_VALUE argument.
- Issue #26293: Fixed writing ZIP files that starts not from the start of the
file. Offsets in ZIP file now are relative to the start of the archive in
conforming to the specification.
- Issue #28380: unittest.mock Mock autospec functions now properly support - Issue #28380: unittest.mock Mock autospec functions now properly support
assert_called, assert_not_called, and assert_called_once. assert_called, assert_not_called, and assert_called_once.