[3.13] gh-140530: fix a reference leak in an error path for `raise exc from cause...

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)

diff --git a/Lib/test/test_raise.py b/Lib/test/test_raise.py
index 6d26a61bee4292acd9883a244b94073c13863fab..ca253585e1a8aa1e88a0c69cc863f0adfbafee5e 100644 (file)
--- a/Lib/test/test_raise.py
+++ b/Lib/test/test_raise.py
@@ -186,18 +186,14 @@ class TestCause(unittest.TestCase):
             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 (file)
index 0000000..e3af493
--- /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 a73b362e58a47bb3068b4bda3630feab1147f9d3..0be6c57c1cf1ddabd5945877f09d3145f2ac1239 100644 (file)
--- 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);