]> granicus.if.org Git - python/commitdiff
don't ignore exceptions from _PyObject_LengthHint
authorBenjamin Peterson <benjamin@python.org>
Sat, 9 May 2009 19:17:59 +0000 (19:17 +0000)
committerBenjamin Peterson <benjamin@python.org>
Sat, 9 May 2009 19:17:59 +0000 (19:17 +0000)
Python/bltinmodule.c

index 8f6e85555a82693636fd3e3fbbbfdd4a9509b377..f8a6d931ac83151d5fc2afe0d8d2eccd175d31eb 100644 (file)
@@ -2383,8 +2383,10 @@ builtin_zip(PyObject *self, PyObject *args)
        len = -1;       /* unknown */
        for (i = 0; i < itemsize; ++i) {
                PyObject *item = PyTuple_GET_ITEM(args, i);
-               Py_ssize_t thislen = _PyObject_LengthHint(item, -1);
+               Py_ssize_t thislen = _PyObject_LengthHint(item, -2);
                if (thislen < 0) {
+                       if (thislen == -1)
+                               return NULL;
                        len = -1;
                        break;
                }