Issue #14160: TarFile.extractfile() failed to resolve symbolic links
when the links were not located in an archive subdirectory.
This commit is contained in:
parent
d11d0d6343
commit
1ef9eda7bc
|
@ -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
|
||||
|
|
|
@ -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):
|
||||
|
||||
|
|
Binary file not shown.
|
@ -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.
|
||||
|
||||
|
|
Loading…
Reference in New Issue