Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-40170: Fix PyType_Ready() refleak on static type (GH-23236) 

bpo-1635741, bpo-40170: When called on a static type with NULL
tp_base, PyType_Ready() no longer increments the reference count of
the PyBaseObject_Type ("object). PyTypeObject.tp_base is a strong
reference on a heap type, but it is borrowed reference on a static
type.

Fix 99 reference leaks at Python exit (showrefcount 18623 => 18524).
This commit is contained in:
Victor Stinner 2020-11-11 14:27:32 +01:00 committed by GitHub
parent f9a8386e44
commit ba2958ed40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Include/cpython/object.h
View File

@ -244,6 +244,7 @@ struct _typeobject {
struct PyMethodDef *tp_methods; struct PyMethodDef *tp_methods;
struct PyMemberDef *tp_members; struct PyMemberDef *tp_members;
struct PyGetSetDef *tp_getset; struct PyGetSetDef *tp_getset;
// Strong reference on a heap type, borrowed reference on a static type
struct _typeobject *tp_base; struct _typeobject *tp_base;
PyObject *tp_dict; PyObject *tp_dict;
descrgetfunc tp_descr_get; descrgetfunc tp_descr_get;

9
Objects/typeobject.c
View File

@ -5487,8 +5487,13 @@ PyType_Ready(PyTypeObject *type)
/* Initialize tp_base (defaults to BaseObject unless that's us) */ /* Initialize tp_base (defaults to BaseObject unless that's us) */
base = type->tp_base; base = type->tp_base;
if (base == NULL && type != &PyBaseObject_Type) { if (base == NULL && type != &PyBaseObject_Type) {
base = type->tp_base = &PyBaseObject_Type; base = &PyBaseObject_Type;
Py_INCREF(base); if (type->tp_flags & Py_TPFLAGS_HEAPTYPE) {
type->tp_base = (PyTypeObject*)Py_NewRef((PyObject*)base);
}
else {
type->tp_base = base;
}
} }
/* Now the only way base can still be NULL is if type is /* Now the only way base can still be NULL is if type is