Patch from SF bug 570483 (Tim Northover).

In a fresh interpreter, type.mro(tuple) would segfault, because
PyType_Ready() isn't called for tuple yet.  To fix, call
PyType_Ready(type) if type->tp_dict is NULL.

diff --git a/Misc/ACKS b/Misc/ACKS
index c7da1b0354f28c082365682dadcb5116736b07f3..fb649413122c77508a2fd6fb785fd951271dc290 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -336,6 +336,7 @@ Oscar Nierstrasz
 Hrvoje Niksic
 Bill Noon
 Stefan Norberg
+Tim Northover
 Joe Norton
 Neal Norwitz
 Jeffrey Ollie

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 0051179c2f615e0ea9fcb6c021cbaf8c9a6be185..7918af09dbc145871680b38fe312ac97ff14d6d8 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -742,6 +742,11 @@ mro_implementation(PyTypeObject *type)
        int i, n, ok;
        PyObject *bases, *result;
 
+       if(type->tp_dict == NULL) {
+               if(PyType_Ready(type) < 0)
+                       return NULL;
+       }
+
        bases = type->tp_bases;
        n = PyTuple_GET_SIZE(bases);
        result = Py_BuildValue("[O]", (PyObject *)type);