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

links when the links were not located in an archive subdirectory.

3 files changed, 4 insertions, 1 deletions

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index e3380a2d6b..efb277309b 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -2481,7 +2481,7 @@ class TarFile(object):
         """
         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
index ce543df3cc..4967ad087c 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -171,6 +171,9 @@ class UstarReadTest(ReadTest):
     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
index b93210453d..bb9345373e 100644
--- a/Lib/test/testtar.tar
+++ b/Lib/test/testtar.tar