Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-74468: Fix a mis-taken source of tarfile extracted names #102424

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
ethanfurman merged 2 commits into from
Mar 27, 2023
Merged

gh-74468: Fix a mis-taken source of tarfile extracted names #102424

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
a459610
Fix a mis-taken source of tarfile extracted names
arhadthedev Mar 4, 2023
09ab346
Address the review
arhadthedev Mar 22, 2023
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
Next Next commit
Fix a mis-taken source of tarfile extracted names
  • Loading branch information
@arhadthedev
arhadthedev committed Mar 4, 2023
commit a4596100e8049306f2257465a920b44a02a40ca7
6 changes: 3 additions & 3 deletions Lib/tarfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,12 +601,12 @@ class _FileInFile(object):
object.
"""

def __init__(self, fileobj, offset, size, blockinfo=None):
def __init__(self, fileobj, offset, size, name, blockinfo=None):
self.fileobj = fileobj
self.offset = offset
self.size = size
self.position = 0
self.name = getattr(fileobj, "name", None)
self.name = name
self.closed = False

if blockinfo is None:
Expand Down Expand Up @@ -703,7 +703,7 @@ class ExFileObject(io.BufferedReader):

def __init__(self, tarfile, tarinfo):
fileobj = _FileInFile(tarfile.fileobj, tarinfo.offset_data,
tarinfo.size, tarinfo.sparse)
tarinfo.size, tarinfo.name, tarinfo.sparse)
super().__init__(fileobj)
#class ExFileObject

Expand Down
7 changes: 7 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 @@ -479,6 +479,13 @@ def test_length_zero_header(self):
with tarfile.open(support.findfile('recursion.tar')) as tar:
pass

def test_extractfile_name(self):
# gh-74468: TarFile.name must name a file, not a parent archive.
file = self.tar.getmember('ustar/regtype')
with self.tar.extractfile(file) as fobj:
self.assertEqual(fobj.name, 'ustar/regtype')


class MiscReadTestBase(CommonReadTest):
def requires_name_attribute(self):
pass
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2023-03-04-20-58-29.gh-issue-74468.Ac5Ew_.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Attribute name of the extracted :mod:`tarfile` file object now holds
filename of itself rather than then of the archive it is contained in.
Comment thread
arhadthedev marked this conversation as resolved.
Outdated
Patch by Oleg Iarygin.