mirror of https://github.com/python/cpython
Issue #7341: Close the internal file object in the TarFile
constructor in case of an error.
This commit is contained in:
parent
c029942ea0
commit
355538e5f5
|
@ -1557,6 +1557,7 @@ class TarFile(object):
|
||||||
self.inodes = {} # dictionary caching the inodes of
|
self.inodes = {} # dictionary caching the inodes of
|
||||||
# archive members already added
|
# archive members already added
|
||||||
|
|
||||||
|
try:
|
||||||
if self.mode == "r":
|
if self.mode == "r":
|
||||||
self.firstmember = None
|
self.firstmember = None
|
||||||
self.firstmember = self.next()
|
self.firstmember = self.next()
|
||||||
|
@ -1578,6 +1579,11 @@ class TarFile(object):
|
||||||
buf = self.tarinfo.create_pax_global_header(self.pax_headers.copy())
|
buf = self.tarinfo.create_pax_global_header(self.pax_headers.copy())
|
||||||
self.fileobj.write(buf)
|
self.fileobj.write(buf)
|
||||||
self.offset += len(buf)
|
self.offset += len(buf)
|
||||||
|
except:
|
||||||
|
if not self._extfileobj:
|
||||||
|
self.fileobj.close()
|
||||||
|
self.closed = True
|
||||||
|
raise
|
||||||
|
|
||||||
def _getposix(self):
|
def _getposix(self):
|
||||||
return self.format == USTAR_FORMAT
|
return self.format == USTAR_FORMAT
|
||||||
|
|
|
@ -440,6 +440,9 @@ Core and Builtins
|
||||||
Library
|
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
|
- Issue #7293: distutils.test_msvc9compiler is fixed to work on any fresh
|
||||||
Windows box. Help provided by David Bolen.
|
Windows box. Help provided by David Bolen.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue