bpo-42015: Reorder dereferencing calls in meth_dealloc, to make sure m_self is kept alive long enough (GH-22670)
This commit is contained in:
parent
24a54c0bd4
commit
04b8631d84
|
@ -0,0 +1,3 @@
|
|||
Fix potential crash in deallocating method objects when dynamically
|
||||
allocated `PyMethodDef`'s lifetime is managed through the ``self``
|
||||
argument of a `PyCFunction`.
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue