don't ignore exceptions from _PyObject_LengthHint

4c1fe51c · Benjamin Peterson · a7dc949e · 4c1fe51c
Kaydet (Commit) 4c1fe51c authored May 09, 2009 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

bltinmodule.c Python/bltinmodule.c +3 -1

No files found.
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -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;
 		}