diff options
author | Jack DeVries <58614260+jdevries3133@users.noreply.github.com> | 2021-09-29 09:25:48 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-29 09:25:48 (GMT) |
commit | b6fe8572509b77d2002eaddf99d718e9b4835684 (patch) | |
tree | e99950e2ca2dc6a94a78625d669e4d466a923068 /Lib/tarfile.py | |
parent | 233b9da07d15f19c11e483e7ef7e3c73422e03f9 (diff) | |
download | cpython-b6fe8572509b77d2002eaddf99d718e9b4835684.zip cpython-b6fe8572509b77d2002eaddf99d718e9b4835684.tar.gz cpython-b6fe8572509b77d2002eaddf99d718e9b4835684.tar.bz2 |
bpo-39039: tarfile raises descriptive exception from zlib.error (GH-27766)
* 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
Diffstat (limited to 'Lib/tarfile.py')
-rwxr-xr-x | Lib/tarfile.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 18d415a..c1ee122 100755 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -2349,6 +2349,15 @@ class TarFile(object): 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: |