Commit7536e69

committed

Return Py_EnterRecursiveCall to _PyObject_FastCallDict

1 parent78a0644 commit7536e69Copy full SHA for 7536e69

File tree

-3

lines changed

-3

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,17 +107,23 @@ _PyObject_FastCallDict(PyObject callable, PyObject const *args,`
`107`	`107`	`return_PyObject_MakeTpCall(callable,args,nargs,kwargs);`
`108`	`108`	`}`
`109`	`109`
`110`		`-PyObject*res;`
	`110`	`+PyObject*res=NULL;`
`111`	`111`	`if (kwargs==NULL) {`
`112`		`-res=func(callable,args,nargsf,NULL);`
	`112`	`+if (Py_EnterRecursiveCall(" while calling a Python object")==0) {`
	`113`	`+res=func(callable,args,nargsf,NULL);`
	`114`	`+Py_LeaveRecursiveCall();`
	`115`	`+ }`
`113`	`116`	`}`
`114`	`117`	`else {`
`115`	`118`	`PyObject*kwnames;`
`116`	`119`	`PyObjectconstnewargs;`
`117`	`120`	`if (_PyStack_UnpackDict(args,nargs,kwargs,&newargs,&kwnames)<0) {`
`118`	`121`	`returnNULL;`
`119`	`122`	`}`
`120`		`-res=func(callable,newargs,nargs,kwnames);`
	`123`	`+if (Py_EnterRecursiveCall(" while calling a Python object")==0) {`
	`124`	`+res=func(callable,newargs,nargs,kwnames);`
	`125`	`+Py_LeaveRecursiveCall();`
	`126`	`+ }`
`121`	`127`	`if (kwnames!=NULL) {`
`122`	`128`	`Py_ssize_ti,n=PyTuple_GET_SIZE(kwnames)+nargs;`
`123`	`129`	`for (i=0;i<n;i++) {`

Comments

(0)