(original) (raw)

changeset: 94348:c087ac6fc171 branch: 2.7 parent: 94345:1f07af946fe8 user: Serhiy Storchaka storchaka@gmail.com date: Wed Jan 28 10:52:49 2015 +0200 files: Misc/NEWS Objects/typeobject.c description: Issue #22079: PyType_Ready() now checks that statically allocated type has no dynamically allocated bases. diff -r 1f07af946fe8 -r c087ac6fc171 Misc/NEWS --- a/Misc/NEWS Wed Jan 28 07:29:13 2015 +0000 +++ b/Misc/NEWS Wed Jan 28 10:52:49 2015 +0200 @@ -117,6 +117,12 @@ - Issue #23212: Update 10.5 OS X installer build to use OpenSSL 1.0.1k. +C API +----- + +- Issue #22079: PyType_Ready() now checks that statically allocated type has + no dynamically allocated bases. + What's New in Python 2.7.9? =========================== diff -r 1f07af946fe8 -r c087ac6fc171 Objects/typeobject.c --- a/Objects/typeobject.c Wed Jan 28 07:29:13 2015 +0000 +++ b/Objects/typeobject.c Wed Jan 28 10:52:49 2015 +0200 @@ -4073,6 +4073,20 @@ 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)) { /storchaka@gmail.com