Check that all base classes are indeed class objects, rather than
expecting the caller to do so.
diff --git a/Objects/classobject.c b/Objects/classobject.c
index 1cbbcf7..d10cbe6 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -43,7 +43,7 @@
PyClass_New(bases, dict, name)
PyObject *bases; /* NULL or tuple of classobjects! */
PyObject *dict;
- PyObject *name; /* String; NULL if unknown */
+ PyObject *name;
{
PyClassObject *op, *dummy;
static PyObject *getattrstr, *setattrstr, *delattrstr;
@@ -63,6 +63,16 @@
if (namestr == NULL)
return NULL;
}
+ if (name == NULL || !PyString_Check(name)) {
+ PyErr_SetString(PyExc_SystemError,
+ "PyClass_New: name must be a string");
+ return NULL;
+ }
+ if (dict == NULL || !PyDict_Check(dict)) {
+ PyErr_SetString(PyExc_SystemError,
+ "PyClass_New: dict must be a dictionary");
+ return NULL;
+ }
if (PyDict_GetItem(dict, docstr) == NULL) {
if (PyDict_SetItem(dict, docstr, Py_None) < 0)
return NULL;
@@ -70,9 +80,9 @@
if (PyDict_GetItem(dict, modstr) == NULL) {
PyObject *globals = PyEval_GetGlobals();
if (globals != NULL) {
- PyObject *name = PyDict_GetItem(globals, namestr);
- if (name != NULL) {
- if (PyDict_SetItem(dict, modstr, name) < 0)
+ PyObject *modname = PyDict_GetItem(globals, namestr);
+ if (modname != NULL) {
+ if (PyDict_SetItem(dict, modstr, modname) < 0)
return NULL;
}
}
@@ -82,8 +92,23 @@
if (bases == NULL)
return NULL;
}
- else
+ else {
+ int i;
+ if (!PyTuple_Check(bases)) {
+ PyErr_SetString(PyExc_SystemError,
+ "PyClass_New: bases must be a tuple");
+ return NULL;
+ }
+ i = PyTuple_Size(bases);
+ while (--i >= 0) {
+ if (!PyClass_Check(PyTuple_GetItem(bases, i))) {
+ PyErr_SetString(PyExc_SystemError,
+ "PyClass_New: base must be a class");
+ return NULL;
+ }
+ }
Py_INCREF(bases);
+ }
op = PyObject_NEW(PyClassObject, &PyClass_Type);
if (op == NULL) {
Py_DECREF(bases);