From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 3 Mar 2005 23:15:04 +0000 (+0000)
Subject: Patch #1103407: Properly deal with tarfile iterators when untarring
X-Git-Tag: v2.4.1c1~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f05d1c0099fa3f5a46b0d9b0eb709db3bbb6cf2f;p=thirdparty%2FPython%2Fcpython.git

Patch #1103407: Properly deal with tarfile iterators when untarring
symbolic links on Windows. Fixes #1100429.
---

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index b85f117c9768..4a57e3ae4186 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1840,6 +1840,7 @@ class TarIter:
         """Construct a TarIter object.
         """
         self.tarfile = tarfile
+        self.index = 0
     def __iter__(self):
         """Return iterator object.
         """
@@ -1848,10 +1849,20 @@ class TarIter:
         """Return the next item using TarFile's next() method.
            When all members have been read, set TarFile as _loaded.
         """
-        tarinfo = self.tarfile.next()
-        if not tarinfo:
-            self.tarfile._loaded = True
-            raise StopIteration
+        # Fix for SF #1100429: Under rare circumstances it can
+        # happen that getmembers() is called during iteration,
+        # which will cause TarIter to stop prematurely.
+        if not self.tarfile._loaded:
+            tarinfo = self.tarfile.next()
+            if not tarinfo:
+                self.tarfile._loaded = True
+                raise StopIteration
+        else:
+            try:
+                tarinfo = self.tarfile.members[self.index]
+            except IndexError:
+                raise StopIteration
+        self.index += 1
         return tarinfo
 
 # Helper classes for sparse file support
diff --git a/Misc/NEWS b/Misc/NEWS
index b3cabe92705d..d5511eb217f6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,9 @@ Extension Modules
 Library
 -------
 
+- Patch #1103407: Properly deal with tarfile iterators when untarring
+  symbolic links on Windows.
+
 - Patch #1117454: Remove code to special-case cookies without values
   in LWPCookieJar.