diff options
| author | Steve Dower <steve.dower@python.org> | 2020-10-19 15:50:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-19 15:50:36 +0100 |
| commit | c82f10450c547eb94a04ee17b7c816ff31948297 (patch) | |
| tree | ad305c05c5745e1a5e7c136545bec7eefa741e32 /Objects/methodobject.c | |
| parent | eee6bb50c69d94280f43b47390ea9d1b5f42930c (diff) | |
| parent | b580ed1d9d55461d8dde027411b90be26cae131e (diff) | |
| download | cpython-git-bpo-39107.tar.gz | |
Merge branch 'master' into bpo-39107bpo-39107
Diffstat (limited to 'Objects/methodobject.c')
| -rw-r--r-- | Objects/methodobject.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Objects/methodobject.c b/Objects/methodobject.c index 5659f2143d..7b430416c5 100644 --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -164,9 +164,11 @@ meth_dealloc(PyCFunctionObject *m) if (m->m_weakreflist != NULL) { PyObject_ClearWeakRefs((PyObject*) m); } + // Dereference class before m_self: PyCFunction_GET_CLASS accesses + // PyMethodDef m_ml, which could be kept alive by m_self + Py_XDECREF(PyCFunction_GET_CLASS(m)); Py_XDECREF(m->m_self); Py_XDECREF(m->m_module); - Py_XDECREF(PyCFunction_GET_CLASS(m)); PyObject_GC_Del(m); } @@ -243,9 +245,9 @@ meth_get__qualname__(PyCFunctionObject *m, void *closure) static int meth_traverse(PyCFunctionObject *m, visitproc visit, void *arg) { + Py_VISIT(PyCFunction_GET_CLASS(m)); Py_VISIT(m->m_self); Py_VISIT(m->m_module); - Py_VISIT(PyCFunction_GET_CLASS(m)); return 0; } |