diff --git a/Misc/NEWS b/Misc/NEWS index dd2fe5311f6..8f13e6079d2 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1519,6 +1519,9 @@ Build C API ----- +- Issue #22079: PyType_Ready() now checks that statically allocated type has + no dynamically allocated bases. + - Issue #22453: Removed non-documented macro PyObject_REPR(). - Issue #18395: Rename ``_Py_char2wchar()`` to :c:func:`Py_DecodeLocale`, diff --git a/Objects/typeobject.c b/Objects/typeobject.c index a1b2cb738ef..41771295e3f 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -4683,6 +4683,20 @@ PyType_Ready(PyTypeObject *type) inherit_slots(type, (PyTypeObject *)b); } + /* All bases of statically allocated type should be statically allocated */ + if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) + for (i = 0; i < n; i++) { + PyObject *b = PyTuple_GET_ITEM(bases, i); + if (PyType_Check(b) && + (((PyTypeObject *)b)->tp_flags & Py_TPFLAGS_HEAPTYPE)) { + PyErr_Format(PyExc_TypeError, + "type '%.100s' is not dynamically allocated but " + "its base type '%.100s' is dynamically allocated", + type->tp_name, ((PyTypeObject *)b)->tp_name); + goto error; + } + } + /* Sanity check for tp_free. */ if (PyType_IS_GC(type) && (type->tp_flags & Py_TPFLAGS_BASETYPE) && (type->tp_free == NULL || type->tp_free == PyObject_Del)) {