diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2015-01-28 11:03:33 +0200 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-01-28 11:03:33 +0200 |
| commit | e09bcc874a21ce351a7fe73b9a137e236550d03c (patch) | |
| tree | 8db3467cbc8fec6df15e1868d2557afecbd9569b | |
| parent | db071640537f620a562be1b797ceccae25f436a9 (diff) | |
| download | cpython-git-e09bcc874a21ce351a7fe73b9a137e236550d03c.tar.gz | |
Issue #22079: PyType_Ready() now checks that statically allocated type has
no dynamically allocated bases.
| -rw-r--r-- | Misc/NEWS | 7 | ||||
| -rw-r--r-- | Objects/typeobject.c | 14 |
2 files changed, 21 insertions, 0 deletions
@@ -332,6 +332,12 @@ Build - Issue #17128: Use private version of OpenSSL for 2.7.9 OS X 10.5+ installer. +C API +----- + +- Issue #22079: PyType_Ready() now checks that statically allocated type has + no dynamically allocated bases. + Documentation ------------- @@ -1136,6 +1142,7 @@ Build C API ----- + - Issue #20942: PyImport_ImportFrozenModuleObject() no longer sets __file__ to match what importlib does; this affects _frozen_importlib as well as any module loaded using imp.init_frozen(). diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 1d98fc2405..453bb50ad3 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -4680,6 +4680,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)) { |