diff options
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/bltinmodule.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index fb6810e..d0411e2 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1717,13 +1717,18 @@ builtin_zip(PyObject *self, PyObject *args) /* args must be a tuple */ assert(PyTuple_Check(args)); - /* Guess at result length: the shortest of the input lengths. */ + /* Guess at result length: the shortest of the input lengths. + If some argument refuses to say, we refuse to guess too, lest + an argument like xrange(sys.maxint) lead us astray.*/ len = -1; /* unknown */ for (i = 0; i < itemsize; ++i) { PyObject *item = PyTuple_GET_ITEM(args, i); int thislen = PySequence_Length(item); - if (thislen < 0) + if (thislen < 0) { PyErr_Clear(); + len = -1; + break; + } else if (len < 0 || thislen < len) len = thislen; } |