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.
........
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 7b7c25e..6ce5fb1 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1549,27 +1549,33 @@
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