cpython: 747855f29b9d (original) (raw)
Mercurial > cpython
changeset 94349:747855f29b9d 3.4
Issue #22079: PyType_Ready() now checks that statically allocated type has no dynamically allocated bases. [#22079]
| Serhiy Storchaka storchaka@gmail.com | |
|---|---|
| date | Wed, 28 Jan 2015 11:03:33 +0200 |
| parents | eecaa42e0c06 |
| children | eb26255e11f1 8dfbaa2e8d26 |
| files | Misc/NEWS Objects/typeobject.c |
| diffstat | 2 files changed, 21 insertions(+), 0 deletions(-)[+] [-] Misc/NEWS 7 Objects/typeobject.c 14 |
line wrap: on
line diff
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -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().
--- 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++) {[](#l2.9)PyObject *b = PyTuple_GET_ITEM(bases, i);[](#l2.10)if (PyType_Check(b) &&[](#l2.11)(((PyTypeObject *)b)->tp_flags & Py_TPFLAGS_HEAPTYPE)) {[](#l2.12)PyErr_Format(PyExc_TypeError,[](#l2.13)"type '%.100s' is not dynamically allocated but "[](#l2.14)"its base type '%.100s' is dynamically allocated",[](#l2.15)type->tp_name, ((PyTypeObject *)b)->tp_name);[](#l2.16)goto error;[](#l2.17)}[](#l2.18)}[](#l2.19)
+ /* 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)) {