summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-01-25 22:33:27 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2017-01-25 22:33:27 (GMT)
commitbda5a2be375ca959ad39212dddae1df71c470659 (patch)
tree8e29878cc3c246772cf2dafce2bb8b7ab0032668 /Objects
parentfc489082c89f3de9dc976b4b54cac56bcdac6a10 (diff)
downloadcpython-bda5a2be375ca959ad39212dddae1df71c470659.zip
cpython-bda5a2be375ca959ad39212dddae1df71c470659.tar.gz
cpython-bda5a2be375ca959ad39212dddae1df71c470659.tar.bz2
Issue #29358: Add postcondition checks on types
Diffstat (limited to 'Objects')
-rw-r--r--Objects/typeobject.c27
1 files changed, 24 insertions, 3 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index bf6d3f1..8d22051 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -121,6 +121,22 @@ skip_signature(const char *doc)
return NULL;
}
+#ifdef Py_DEBUG
+static int
+_PyType_CheckConsistency(PyTypeObject *type)
+{
+ if (!(type->tp_flags & Py_TPFLAGS_READY)) {
+ /* don't check types before PyType_Ready() */
+ return 1;
+ }
+
+ assert(!(type->tp_flags & Py_TPFLAGS_READYING));
+ assert(type->tp_mro != NULL && PyTuple_Check(type->tp_mro));
+ assert(type->tp_dict != NULL);
+ return 1;
+}
+#endif
+
static const char *
_PyType_DocWithoutSignature(const char *name, const char *internal_doc)
{
@@ -719,6 +735,7 @@ type_set_bases(PyTypeObject *type, PyObject *new_bases, void *context)
Py_DECREF(old_bases);
Py_DECREF(old_base);
+ assert(_PyType_CheckConsistency(type));
return res;
undo:
@@ -752,6 +769,7 @@ type_set_bases(PyTypeObject *type, PyObject *new_bases, void *context)
Py_DECREF(old_base);
}
+ assert(_PyType_CheckConsistency(type));
return -1;
}
@@ -3034,6 +3052,7 @@ type_getattro(PyTypeObject *type, PyObject *name)
static int
type_setattro(PyTypeObject *type, PyObject *name, PyObject *value)
{
+ int res;
if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
PyErr_Format(
PyExc_TypeError,
@@ -3043,7 +3062,9 @@ type_setattro(PyTypeObject *type, PyObject *name, PyObject *value)
}
if (_PyObject_GenericSetAttrWithDict((PyObject *)type, name, value, NULL) < 0)
return -1;
- return update_slot(type, name);
+ res = update_slot(type, name);
+ assert(_PyType_CheckConsistency(type));
+ return res;
}
extern void
@@ -4851,7 +4872,7 @@ PyType_Ready(PyTypeObject *type)
Py_ssize_t i, n;
if (type->tp_flags & Py_TPFLAGS_READY) {
- assert(type->tp_dict != NULL);
+ assert(_PyType_CheckConsistency(type));
return 0;
}
assert((type->tp_flags & Py_TPFLAGS_READYING) == 0);
@@ -5045,9 +5066,9 @@ PyType_Ready(PyTypeObject *type)
}
/* All done -- set the ready flag */
- assert(type->tp_dict != NULL);
type->tp_flags =
(type->tp_flags & ~Py_TPFLAGS_READYING) | Py_TPFLAGS_READY;
+ assert(_PyType_CheckConsistency(type));
return 0;
error: