From: Lars Gustäbel <lars@gustaebel.de>
Date: Wed, 18 Nov 2009 21:11:27 +0000 (+0000)
Subject: Merged revisions 76383 via svnmerge from
X-Git-Tag: v3.1.2rc1~327
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7dfcef577e5d713c49322254ab364fcda8fe370a;p=python

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.
  ........
................
---

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 3a3d2c925d..8eb80f88ee 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()
-
-        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.pax_headers:
-                buf = self.tarinfo.create_pax_global_header(self.pax_headers.copy())
-                self.fileobj.write(buf)
-                self.offset += len(buf)
+        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 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)
+        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 07122361fb..f7c24d021a 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.