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

Skip to content

gh-107396: tarfiles: set self.exception before _init_read_gz() #107485

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
encukou merged 4 commits into from
Aug 21, 2023
Merged

gh-107396: tarfiles: set self.exception before _init_read_gz() #107485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e834e78
gh-107396: tarfiles: set self.exception before _init_read_gz()
balmeida-nokia Jul 31, 2023
25ac1e4
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 31, 2023
0993b5b
Update comment
encukou Aug 21, 2023
4b0c2fa
Merge branch 'main' into gh-107396-tarfiles-swap_self.exception
encukou Aug 21, 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
gh-107396: tarfiles: set self.exception before _init_read_gz() 
In the stack call of: _init_read_gz()
```
_read, tarfile.py:548
read, tarfile.py:526
_init_read_gz, tarfile.py:491
```
a try;except exists that uses `self.exception`, so it needs to be set before
calling _init_read_gz().

closes: #107396
  • Loading branch information
@balmeida-nokia
balmeida-nokia committed Aug 18, 2023
commit e834e786a5997f5f4bfdf4686bbd560133d88faa
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 @@ -372,8 +372,8 @@ def __init__(self, name, mode, comptype, fileobj, bufsize,
self.zlib = zlib
self.crc = zlib.crc32(b"")
if mode == "r":
self._init_read_gz()
self.exception = zlib.error
self._init_read_gz()
else:
self._init_write_gz(compresslevel)

Expand Down
17 changes: 17 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 @@ -938,6 +938,23 @@ class LzmaDetectReadTest(LzmaTest, DetectReadTest):
pass


class GzipBrokenHeaderCorrectException(GzipTest, unittest.TestCase):
"""
See: https://github.com/python/cpython/issues/107396
"""
def runTest(self):
f = io.BytesIO(
b'\x1f\x8b' # header
b'\x08' # compression method
b'\x04' # flags
b'\0\0\0\0\0\0' # padding?
Comment thread
encukou marked this conversation as resolved.
Outdated
b'\0\x01' # size
b'\0\0\0\0\0' # corrupt data (zeros)
)
with self.assertRaises(tarfile.ReadError):
tarfile.open(fileobj=f, mode='r|gz')


class MemberReadTest(ReadTest, unittest.TestCase):

def _test_member(self, tarinfo, chksum=None, **kwargs):
Expand Down