traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #22079: PyType_Ready() now checks that statically allocated type has 

no dynamically allocated bases.
This commit is contained in:
Serhiy Storchaka 2015-01-28 11:03:33 +02:00
parent db07164053
commit e09bcc874a
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Misc/NEWS
View File

@ -332,6 +332,12 @@ Build
- Issue #17128: Use private version of OpenSSL for 2.7.9 OS X 10.5+ installer. - 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 Documentation
------------- -------------
@ -1136,6 +1142,7 @@ Build
C API C API
----- -----
- Issue #20942: PyImport_ImportFrozenModuleObject() no longer sets __file__ to - Issue #20942: PyImport_ImportFrozenModuleObject() no longer sets __file__ to
match what importlib does; this affects _frozen_importlib as well as any match what importlib does; this affects _frozen_importlib as well as any
module loaded using imp.init_frozen(). module loaded using imp.init_frozen().

14
Objects/typeobject.c
View File

@ -4680,6 +4680,20 @@ PyType_Ready(PyTypeObject *type)
inherit_slots(type, (PyTypeObject *)b); 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. */ /* Sanity check for tp_free. */
if (PyType_IS_GC(type) && (type->tp_flags & Py_TPFLAGS_BASETYPE) && if (PyType_IS_GC(type) && (type->tp_flags & Py_TPFLAGS_BASETYPE) &&
(type->tp_free == NULL || type->tp_free == PyObject_Del)) { (type->tp_free == NULL || type->tp_free == PyObject_Del)) {