https://github.com/python/cpython/commit/718886f6c6f1b1a11121263dff7ce4b7fa5bbcf2
commit: 718886f6c6f1b1a11121263dff7ce4b7fa5bbcf2
branch: 3.13
author: Bénédikt Tran <[email protected]>
committer: picnixz <[email protected]>
date: 2025-11-09T15:57:26+01:00
summary:
[3.13] gh-140530: fix a reference leak in an error path for `raise exc from
cause` (GH-140908) (#141283)
gh-140530: fix a reference leak in an error path for `raise exc from cause`
(#140908)
Fix a reference leak in `raise E from T` when `T` is an exception
subtype for which `T.__new__` does not return an exception instance.
(cherry picked from commit 0c77e7c23b5c270a3142105542c56c59b59c52a0)
files:
A Misc/NEWS.d/next/Core and
Builtins/2025-11-02-12-47-38.gh-issue-140530.S934bp.rst
M Lib/test/test_raise.py
M Python/ceval.c
diff --git a/Lib/test/test_raise.py b/Lib/test/test_raise.py
index 6d26a61bee4292..ca253585e1a8aa 100644
--- a/Lib/test/test_raise.py
+++ b/Lib/test/test_raise.py
@@ -186,18 +186,14 @@ def test_class_cause(self):
self.fail("No exception raised")
def test_class_cause_nonexception_result(self):
- class ConstructsNone(BaseException):
- @classmethod
+ # See https://github.com/python/cpython/issues/140530.
+ class ConstructMortal(BaseException):
def __new__(*args, **kwargs):
- return None
- try:
- raise IndexError from ConstructsNone
- except TypeError as e:
- self.assertIn("should have returned an instance of BaseException",
str(e))
- except IndexError:
- self.fail("Wrong kind of exception raised")
- else:
- self.fail("No exception raised")
+ return ["mortal value"]
+
+ msg = ".*should have returned an instance of BaseException.*"
+ with self.assertRaisesRegex(TypeError, msg):
+ raise IndexError from ConstructMortal
def test_instance_cause(self):
cause = KeyError()
diff --git a/Misc/NEWS.d/next/Core and
Builtins/2025-11-02-12-47-38.gh-issue-140530.S934bp.rst b/Misc/NEWS.d/next/Core
and Builtins/2025-11-02-12-47-38.gh-issue-140530.S934bp.rst
new file mode 100644
index 00000000000000..e3af493893afcb
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and
Builtins/2025-11-02-12-47-38.gh-issue-140530.S934bp.rst
@@ -0,0 +1,2 @@
+Fix a reference leak when ``raise exc from cause`` fails. Patch by Bénédikt
+Tran.
diff --git a/Python/ceval.c b/Python/ceval.c
index a73b362e58a47b..0be6c57c1cf1dd 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1962,6 +1962,7 @@ do_raise(PyThreadState *tstate, PyObject *exc, PyObject
*cause)
"calling %R should have returned an instance of "
"BaseException, not %R",
cause, Py_TYPE(fixed_cause));
+ Py_DECREF(fixed_cause);
goto raise_error;
}
Py_DECREF(cause);
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
