Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 76383 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76383 | lars.gustaebel | 2009-11-18 21:29:25 +0100 (Wed, 18 Nov 2009) | 10 lines

  Merged revisions 76381 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76381 | lars.gustaebel | 2009-11-18 21:24:54 +0100 (Wed, 18 Nov 2009) | 3 lines

    Issue #7341: Close the internal file object in the TarFile
    constructor in case of an error.
  ........
................
This commit is contained in:
Lars Gustäbel 2009-11-18 21:11:27 +00:00
parent b5ea027cb5
commit 7dfcef577e
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Lib/tarfile.py
View File

@ -1554,27 +1554,33 @@ class TarFile(object):
self.inodes = {} # dictionary caching the inodes of
# archive members already added
if self.mode == "r":
self.firstmember = None
self.firstmember = self.next()
try:
if self.mode == "r":
self.firstmember = None
self.firstmember = self.next()
if self.mode == "a":
# Move to the end of the archive,
# before the first empty block.
self.firstmember = None
while True:
if self.next() is None:
if self.offset > 0:
self.fileobj.seek(self.fileobj.tell() - BLOCKSIZE)
break
if self.mode == "a":
# Move to the end of the archive,
# before the first empty block.
self.firstmember = None
while True:
if self.next() is None:
if self.offset > 0:
self.fileobj.seek(self.fileobj.tell() - BLOCKSIZE)
break
if self.mode in "aw":
self._loaded = True
if self.mode in "aw":
self._loaded = True
if self.pax_headers:
buf = self.tarinfo.create_pax_global_header(self.pax_headers.copy())
self.fileobj.write(buf)
self.offset += len(buf)
if self.pax_headers:
buf = self.tarinfo.create_pax_global_header(self.pax_headers.copy())
self.fileobj.write(buf)
self.offset += len(buf)
except:
if not self._extfileobj:
self.fileobj.close()
self.closed = True
raise
#--------------------------------------------------------------------------
# Below are the classmethods which act as alternate constructors to the

3
Misc/NEWS
View File

@ -46,6 +46,9 @@ Core and Builtins
Library
-------
- Issue #7341: Close the internal file object in the TarFile constructor in
case of an error.
- Issue #7293: distutils.test_msvc9compiler is fixed to work on any fresh
Windows box. Help provided by David Bolen.