diff options
author | Georg Brandl <georg@python.org> | 2010-10-14 06:59:45 +0000 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-10-14 06:59:45 +0000 |
commit | 664c4c2ef9bf47dcf20a5e96e67509d56b7f7d32 (patch) | |
tree | 5c221cdea14c5dc990818906d2c06117fd5fe00a /Lib/zipfile.py | |
parent | 54d32b3b1d497a2b3b8c111da23a2253e2c0e1ad (diff) | |
download | cpython-664c4c2ef9bf47dcf20a5e96e67509d56b7f7d32.tar.gz |
#1710703: write zipfile structures also in the case of closing a new, but empty, archive.
Diffstat (limited to 'Lib/zipfile.py')
-rw-r--r-- | Lib/zipfile.py | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py index bcdb2b8c9a..ad04cca784 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -167,7 +167,13 @@ def _EndRecData64(fpin, offset, endrec): """ Read the ZIP64 end-of-archive records and use that to update endrec """ - fpin.seek(offset - sizeEndCentDir64Locator, 2) + try: + fpin.seek(offset - sizeEndCentDir64Locator, 2) + except IOError: + # If the seek fails, the file is not large enough to contain a ZIP64 + # end-of-archive record, so just return the end record we were given. + return endrec + data = fpin.read(sizeEndCentDir64Locator) sig, diskno, reloff, disks = struct.unpack(structEndArchive64Locator, data) if sig != stringEndArchive64Locator: @@ -705,14 +711,22 @@ class ZipFile: if key == 'r': self._GetContents() elif key == 'w': - pass + # set the modified flag so central directory gets written + # even if no files are added to the archive + self._didModify = True elif key == 'a': - try: # See if file is a zip file + try: + # See if file is a zip file self._RealGetContents() # seek to start of directory and overwrite self.fp.seek(self.start_dir, 0) - except BadZipfile: # file is not a zip file, just append + except BadZipfile: + # file is not a zip file, just append self.fp.seek(0, 2) + + # set the modified flag so central directory gets written + # even if no files are added to the archive + self._didModify = True else: if not self._filePassed: self.fp.close() @@ -739,7 +753,10 @@ class ZipFile: def _RealGetContents(self): """Read in the table of contents for the ZIP file.""" fp = self.fp - endrec = _EndRecData(fp) + try: + endrec = _EndRecData(fp) + except IOError: + raise BadZipfile("File is not a zip file") if not endrec: raise BadZipfile("File is not a zip file") if self.debug > 1: |