Skip to content

gh-150077:Fix fileobj leak in tarfile.TarFile.zstopen on BaseException #150080

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

Open
lpyu001 wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −1
Open

gh-150077:Fix fileobj leak in tarfile.TarFile.zstopen on BaseException #150080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8f71c5
fix tarfile: zstopen uses except Exception
lpyu001 May 19, 2026
034ded1
Fix NEWS entry
lpyu001 May 19, 2026
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 @@ -2083,7 +2083,7 @@ def zstopen(cls, name, mode="r", fileobj=None, level=None, options=None,
if mode == 'r':
raise ReadError("not a zstd file") from e
raise
except Exception:
except:
fileobj.close()
raise
t._extfileobj = False
Expand Down
15 changes: 15 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 @@ -1065,6 +1065,21 @@ class LzmaDetectReadTest(LzmaTest, DetectReadTest):
class ZstdDetectReadTest(ZstdTest, DetectReadTest):
pass

@support.requires_zstd()
class ZstdOpenTest(unittest.TestCase):
"""
See: https://github.com/python/cpython/issues/150077
"""
def test_zstopen_closes_fileobj_on_base_exception(self):
fileobj = unittest.mock.Mock()
with unittest.mock.patch("compression.zstd.ZstdFile",
return_value=fileobj), \
unittest.mock.patch.object(tarfile.TarFile, "taropen",
side_effect=KeyboardInterrupt):
with self.assertRaises(KeyboardInterrupt):
tarfile.TarFile.zstopen("foo.tar.zst")
fileobj.close.assert_called_once()

class GzipBrokenHeaderCorrectException(GzipTest, unittest.TestCase):
"""
See: https://github.com/python/cpython/issues/107396
Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Library/2026-05-19-18-25-00.gh-issue-150077.zstopen-close.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fix ``tarfile.TarFile.zstopen`` to close the underlying zstd file object
when opening the tar archive is interrupted by a :exc:`BaseException`
subclass such as :exc:`KeyboardInterrupt`.

Loading