Commit0c77e7c

authored

gh-140530: fix a reference leak in an error path forraise exc from cause (#140908)

Fix a reference leak in `raise E from T` when `T` is an exceptionsubtype for which `T.__new__` does not return an exception instance.

1 parent5ba0a1a commit0c77e7cCopy full SHA for 0c77e7c

File tree

+10

-11

lines changed

+10

-11

lines changed

Lines changed: 7 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -186,18 +186,14 @@ def test_class_cause(self):`
`186`	`186`	`self.fail("No exception raised")`
`187`	`187`
`188`	`188`	`deftest_class_cause_nonexception_result(self):`
`189`		`-classConstructsNone(BaseException):`
`190`		`-@classmethod`
	`189`	`+# See https://github.com/python/cpython/issues/140530.`
	`190`	`+classConstructMortal(BaseException):`
`191`	`191`	`def__new__(args,*kwargs):`
`192`		`-returnNone`
`193`		`-try:`
`194`		`-raiseIndexErrorfromConstructsNone`
`195`		`-exceptTypeErrorase:`
`196`		`-self.assertIn("should have returned an instance of BaseException",str(e))`
`197`		`-exceptIndexError:`
`198`		`-self.fail("Wrong kind of exception raised")`
`199`		`-else:`
`200`		`-self.fail("No exception raised")`
	`192`	`+return ["mortal value"]`
	`193`	`+`
	`194`	`+msg=".should have returned an instance of BaseException."`
	`195`	`+withself.assertRaisesRegex(TypeError,msg):`
	`196`	`+raiseIndexErrorfromConstructMortal`
`201`	`197`
`202`	`198`	`deftest_instance_cause(self):`
`203`	`199`	`cause=KeyError()`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix a reference leak when ``raise exc from cause`` fails. Patch by Bénédikt
	`2`	`+Tran.`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2148,6 +2148,7 @@ do_raise(PyThreadState tstate, PyObject exc, PyObject *cause)`
`2148`	`2148`	`"calling %R should have returned an instance of "`
`2149`	`2149`	`"BaseException, not %R",`
`2150`	`2150`	`cause,Py_TYPE(fixed_cause));`
	`2151`	`+Py_DECREF(fixed_cause);`
`2151`	`2152`	`gotoraise_error;`
`2152`	`2153`	`}`
`2153`	`2154`	`Py_DECREF(cause);`

Comments

(0)