mirror of
https://github.com/python/cpython.git
synced 2025-12-08 06:10:17 +00:00
[3.10] bpo-39039: tarfile raises descriptive exception from zlib.error (GH-27766) (GH-28613)
* during tarfile parsing, a zlib error indicates invalid data
* tarfile.open now raises a descriptive exception from the zlib error
* this makes it clear to the user that they may be trying to open a
corrupted tar file
(cherry picked from commit b6fe857250)
Co-authored-by: Jack DeVries <58614260+jdevries3133@users.noreply.github.com>
This commit is contained in:
parent
1cb17be3e6
commit
d6b69f21d8
3 changed files with 25 additions and 0 deletions
|
|
@ -2349,6 +2349,15 @@ def next(self):
|
|||
raise ReadError(str(e)) from None
|
||||
except SubsequentHeaderError as e:
|
||||
raise ReadError(str(e)) from None
|
||||
except Exception as e:
|
||||
try:
|
||||
import zlib
|
||||
if isinstance(e, zlib.error):
|
||||
raise ReadError(f'zlib error: {e}') from None
|
||||
else:
|
||||
raise e
|
||||
except ImportError:
|
||||
raise e
|
||||
break
|
||||
|
||||
if tarinfo is not None:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue