mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-15 07:15:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-34126: Fix crashes while profiling invalid calls. (GH-8300)

Browse source
This commit is contained in:
jdemeyer 2018-07-21 10:30:59 +02:00 • committed by Serhiy Storchaka
parent a692efe473
commit 56868f940e
3 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Python/ceval.c
View file

@ -4566,10 +4566,16 @@ call_function(PyObject ***pp_stack, Py_ssize_t oparg, PyObject *kwnames)
}
else if (Py_TYPE(func) == &PyMethodDescr_Type) {
PyThreadState *tstate = PyThreadState_GET();
if (tstate->use_tracing && tstate->c_profilefunc) {
// We need to create PyCFunctionObject for tracing.
PyMethodDescrObject *descr = (PyMethodDescrObject*)func;
func = PyCFunction_NewEx(descr->d_method, stack[0], NULL);
if (nargs > 0 && tstate->use_tracing) {
/* We need to create a temporary bound method as argument
for profiling.
If nargs == 0, then this cannot work because we have no
"self". In any case, the call itself would raise
TypeError (foo needs an argument), so we just skip
profiling. */
PyObject *self = stack[0];
func = Py_TYPE(func)->tp_descr_get(func, self, (PyObject*)Py_TYPE(self));
if (func == NULL) {
return NULL;
}