mirror of
https://github.com/python/cpython.git
synced 2025-12-08 06:10:17 +00:00
[3.14] gh-140530: fix a reference leak in an error path for raise exc from cause (GH-140908) (#141282)
gh-140530: fix a reference leak in an error path for `raise exc from cause` (GH-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 0c77e7c23b)
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
This commit is contained in:
parent
cb458715a6
commit
d7aace78e9
3 changed files with 10 additions and 11 deletions
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
Fix a reference leak when ``raise exc from cause`` fails. Patch by Bénédikt
|
||||
Tran.
|
||||
|
|
@ -2108,6 +2108,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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue