Visitar URL original
[3.9] bpo-21987: Fix TarFile.getmember getting a dir with a trailing slash (GH-30283) by miss-islington · Pull Request #30738 · python/cpython · GitHub
Skip to content

[3.9] bpo-21987: Fix TarFile.getmember getting a dir with a trailing slash (GH-30283) #30738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 2 commits into from
Jan 23, 2022
Merged

[3.9] bpo-21987: Fix TarFile.getmember getting a dir with a trailing slash (GH-30283) #30738

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d75d3f
bpo-21987: Fix TarFile.getmember getting a dir with a trailing slash …
akulakov Jan 21, 2022
de1411d
Update Lib/test/test_tarfile.py
serhiy-storchaka Jan 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/tarfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1785,7 +1785,7 @@ def getmember(self, name):
than once in the archive, its last occurrence is assumed to be the
most up-to-date version.
"""
tarinfo = self._getmember(name)
tarinfo = self._getmember(name.rstrip('/'))
if tarinfo is None:
raise KeyError("filename %r not found" % name)
return tarinfo
Expand Down
19 changes: 19 additions & 0 deletions Lib/test/test_tarfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,25 @@ def test_fileobj_symlink2(self):
def test_issue14160(self):
self._test_fileobj_link("symtype2", "ustar/regtype")

def test_add_dir_getmember(self):
# bpo-21987
self.add_dir_and_getmember('bar')
self.add_dir_and_getmember('a'*101)

def add_dir_and_getmember(self, name):
with os_helper.temp_cwd():
Comment thread
serhiy-storchaka marked this conversation as resolved.
Outdated
with tarfile.open(tmpname, 'w') as tar:
try:
os.mkdir(name)
tar.add(name)
finally:
os.rmdir(name)
with tarfile.open(tmpname) as tar:
self.assertEqual(
tar.getmember(name),
tar.getmember(name + '/')
)

class GzipUstarReadTest(GzipTest, UstarReadTest):
pass

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2021-12-28-11-55-10.bpo-21987.avBK-p.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix an issue with :meth:`tarfile.TarFile.getmember` getting a directory name
with a trailing slash.