diff options
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/object.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/Objects/object.c b/Objects/object.c index 85fd35f..1bd8db9 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1520,14 +1520,22 @@ merge_class_dict(PyObject* dict, PyObject* aclass) if (bases == NULL) PyErr_Clear(); else { + /* We have no guarantee that bases is a real tuple */ int i, n; - assert(PyTuple_Check(bases)); - n = PyTuple_GET_SIZE(bases); - for (i = 0; i < n; i++) { - PyObject *base = PyTuple_GET_ITEM(bases, i); - if (merge_class_dict(dict, base) < 0) { - Py_DECREF(bases); - return -1; + n = PySequence_Size(bases); /* This better be right */ + if (n < 0) + PyErr_Clear(); + else { + for (i = 0; i < n; i++) { + PyObject *base = PySequence_GetItem(bases, i); + if (base == NULL) { + Py_DECREF(bases); + return -1; + } + if (merge_class_dict(dict, base) < 0) { + Py_DECREF(bases); + return -1; + } } } Py_DECREF(bases); |