From 231d474a7b1747d22c383802473fb15b549f22cb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gust=C3=A4bel?= Date: Tue, 24 Apr 2012 22:42:08 +0200 Subject: [PATCH] Issue #14160: TarFile.extractfile() failed to resolve symbolic links when the links were not located in an archive subdirectory. --- Lib/tarfile.py | 2 +- Lib/test/test_tarfile.py | 3 +++ Lib/test/testtar.tar | Bin 281088 -> 281600 bytes Misc/NEWS | 3 +++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Lib/tarfile.py b/Lib/tarfile.py index bd73965abf..02858ae035 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -2397,7 +2397,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 d5b864e238..a3685ea273 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -154,6 +154,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 bac0e2628f35243f236db2fac82737882699b2f0..440182a437da84ef3d61d8cbc0f4209254615b37 100644 GIT binary patch delta 58 zcmV-A0LA}+lo5cK5rCut`UrD*ZFG5XWipdt0bG_Y0tAz2LN5k2FfafhGLjx-k{$(< Q1_Anp`T>Ue0;c){P+b8OiU0rr delta 20 ccmZpeA=ofQuwe<~ueLvoZGV`S{b3FO0AUFUY5)KL diff --git a/Misc/NEWS b/Misc/NEWS index 282a8eb265..1e088c03e0 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -56,6 +56,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. -- 2.50.1