diff options
| -rw-r--r-- | Lib/tarfile.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_tarfile.py | 3 | ||||
| -rw-r--r-- | Lib/test/testtar.tar | bin | 427008 -> 435200 bytes | |||
| -rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 7 insertions, 1 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index af32b0f..f26953e 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -2496,7 +2496,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 1757e44..f32eb8c 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -166,6 +166,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 Binary files differindex b932104..bb93453 100644 --- a/Lib/test/testtar.tar +++ b/Lib/test/testtar.tar @@ -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. |