Commit8a285df

authored

GH-93252: Fix error handling for failed Python calls (GH-94693)

1 parent4bed0db commit8a285dfCopy full SHA for 8a285df

File tree

+19

-1

lines changed

+19

-1

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,18 @@ def fn(**kw):`
`26`	`26`	`self.assertIsInstance(res,dict)`
`27`	`27`	`self.assertEqual(list(res.items()),expected)`
`28`	`28`
	`29`	`+deftest_frames_are_popped_after_failed_calls(self):`
	`30`	`+# GH-93252: stuff blows up if we don't pop the new frame after`
	`31`	`+# recovering from failed calls:`
	`32`	`+deff():`
	`33`	`+pass`
	`34`	`+for_inrange(1000):`
	`35`	`+try:`
	`36`	`+f(None)`
	`37`	`+exceptTypeError:`
	`38`	`+pass`
	`39`	`+# BOOM!`
	`40`	`+`
`29`	`41`
`30`	`42`	`@cpython_only`
`31`	`43`	`classCFunctionCallsErrorMessages(unittest.TestCase):`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix an issue that caused internal frames to outlive failed Python function`
	`2`	`+calls, possibly resulting in memory leaks or hard interpreter crashes.`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6410,7 +6410,7 @@ _PyEvalFramePushAndInit(PyThreadState tstate, PyFunctionObject func,`
`6410`	`6410`	`}`
`6411`	`6411`	`if (initialize_locals(tstate,func,localsarray,args,argcount,kwnames)) {`
`6412`	`6412`	`assert(frame->owner!=FRAME_OWNED_BY_GENERATOR);`
`6413`		`-_PyFrame_Clear(frame);`
	`6413`	`+_PyEvalFrameClearAndPop(tstate,frame);`
`6414`	`6414`	`returnNULL;`
`6415`	`6415`	`}`
`6416`	`6416`	`returnframe;`
`@@ -6432,6 +6432,10 @@ _PyEvalFramePushAndInit(PyThreadState tstate, PyFunctionObject func,`
`6432`	`6432`	`staticvoid`
`6433`	`6433`	`_PyEvalFrameClearAndPop(PyThreadStatetstate,_PyInterpreterFrameframe)`
`6434`	`6434`	`{`
	`6435`	`+// Make sure that this is, indeed, the top frame. We can't check this in`
	`6436`	`+// _PyThreadState_PopFrame, since f_code is already cleared at that point:`
	`6437`	`+assert((PyObject**)frame+frame->f_code->co_framesize==`
	`6438`	`+tstate->datastack_top);`
`6435`	`6439`	`tstate->recursion_remaining--;`
`6436`	`6440`	`assert(frame->frame_obj==NULL\|\|frame->frame_obj->f_frame==frame);`
`6437`	`6441`	`assert(frame->owner==FRAME_OWNED_BY_THREAD);`

Comments

(0)