Fix a stupid little bug: len() of an unsized returns -1 and leaves an

exception waiting to happen next...

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 727f8d19946eefdb7cdd72e9eb59317e3d7ad080..775c318becae69217d677efc68a9c5e1297ded33 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1098,10 +1098,14 @@ builtin_len(self, args)
        PyObject *args;
 {
        PyObject *v;
+       long res;
 
        if (!PyArg_ParseTuple(args, "O:len", &v))
                return NULL;
-       return PyInt_FromLong((long)PyObject_Length(v));
+       res = PyObject_Length(v);
+       if (res < 0 && PyErr_Occurred())
+               return NULL;
+       return PyInt_FromLong(res);
 }
 
 static char len_doc[] =