From 56868f940e0cc0b35d33c0070107ff3bed2d8766 Mon Sep 17 00:00:00 2001 From: jdemeyer Date: Sat, 21 Jul 2018 10:30:59 +0200 Subject: bpo-34126: Fix crashes while profiling invalid calls. (GH-8300) --- Python/ceval.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'Python') diff --git a/Python/ceval.c b/Python/ceval.c index 90ad591dcd..465e03012a 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -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; } -- cgit v1.2.1