Merge with 3.2: Issue #14160: TarFile.extractfile() failed to resolve symbolic

gustaebel · gustaebel · commit 9f478c021dc4 · 2012-04-24T21:09:17.000+02:00
links when the links were not located in an archive subdirectory.
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
@@ -2481,7 +2481,7 @@ def _find_link_target(self, tarinfo):
         """
         if tarinfo.issym():
             # Always search the entire archive.
-            linkname = os.path.dirname(tarinfo.name) + "/" + tarinfo.linkname
+            linkname = "/".join(filter(None, (os.path.dirname(tarinfo.name), tarinfo.linkname)))
             limit = None
         else:
             # Search the archive before the link, because a hard link is
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
@@ -171,6 +171,9 @@ def test_fileobj_symlink1(self):
     def test_fileobj_symlink2(self):
         self._test_fileobj_link("./ustar/linktest2/symtype", "ustar/linktest1/regtype")
 
+    def test_issue14160(self):
+        self._test_fileobj_link("symtype2", "ustar/regtype")
+
 
 class CommonReadTest(ReadTest):
 
diff --git a/Lib/test/testtar.tar b/Lib/test/testtar.tar
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -71,6 +71,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #14160: TarFile.extractfile() failed to resolve symbolic links when
+  the links were not located in an archive subdirectory.
+
 - Issue #14638: pydoc now treats non-string __name__ values as if they
   were missing, instead of raising an error.
 
