Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check that all base classes are indeed class objects, rather than 

expecting the caller to do so.
This commit is contained in:
Guido van Rossum 1997-10-07 14:54:11 +00:00
parent 79378ffd91
commit 04d73c495e
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Objects/classobject.c
View File

@ -43,7 +43,7 @@ PyObject *
PyClass_New(bases, dict, name) PyClass_New(bases, dict, name)
PyObject *bases; /* NULL or tuple of classobjects! */ PyObject *bases; /* NULL or tuple of classobjects! */
PyObject *dict; PyObject *dict;
PyObject *name; /* String; NULL if unknown */ PyObject *name;
{ {
PyClassObject *op, *dummy; PyClassObject *op, *dummy;
static PyObject *getattrstr, *setattrstr, *delattrstr; static PyObject *getattrstr, *setattrstr, *delattrstr;
@ -63,6 +63,16 @@ PyClass_New(bases, dict, name)
if (namestr == NULL) if (namestr == NULL)
return 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_GetItem(dict, docstr) == NULL) {
if (PyDict_SetItem(dict, docstr, Py_None) < 0) if (PyDict_SetItem(dict, docstr, Py_None) < 0)
return NULL; return NULL;
@ -70,9 +80,9 @@ PyClass_New(bases, dict, name)
if (PyDict_GetItem(dict, modstr) == NULL) { if (PyDict_GetItem(dict, modstr) == NULL) {
PyObject *globals = PyEval_GetGlobals(); PyObject *globals = PyEval_GetGlobals();
if (globals != NULL) { if (globals != NULL) {
PyObject *name = PyDict_GetItem(globals, namestr); PyObject *modname = PyDict_GetItem(globals, namestr);
if (name != NULL) { if (modname != NULL) {
if (PyDict_SetItem(dict, modstr, name) < 0) if (PyDict_SetItem(dict, modstr, modname) < 0)
return NULL; return NULL;
} }
} }
@ -82,8 +92,23 @@ PyClass_New(bases, dict, name)
if (bases == NULL) if (bases == NULL)
return 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); Py_INCREF(bases);
}
op = PyObject_NEW(PyClassObject, &PyClass_Type); op = PyObject_NEW(PyClassObject, &PyClass_Type);
if (op == NULL) { if (op == NULL) {
Py_DECREF(bases); Py_DECREF(bases);