diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 3a3d2c925d7..8eb80f88ee9 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -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 diff --git a/Misc/NEWS b/Misc/NEWS index 07122361fb5..f7c24d021a4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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.