[Python-checkins] cpython (3.4): Issue #22079: PyType_Ready() now checks that statically allocated type has
serhiy.storchaka
python-checkins at python.org
Wed Jan 28 10:10:28 CET 2015
https://hg.python.org/cpython/rev/747855f29b9d
changeset: 94349:747855f29b9d
branch: 3.4
parent: 94346:eecaa42e0c06
user: Serhiy Storchaka <storchaka at gmail.com>
date: Wed Jan 28 11:03:33 2015 +0200
summary:
Issue #22079: PyType_Ready() now checks that statically allocated type has
no dynamically allocated bases.
files:
Misc/NEWS | 7 +++++++
Objects/typeobject.c | 14 ++++++++++++++
2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -332,6 +332,12 @@
- 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 @@
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
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4680,6 +4680,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)) {
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list