diff options
Diffstat (limited to 'Python/bltinmodule.c')
| -rw-r--r-- | Python/bltinmodule.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index f63e27adc6..af5a55b8e0 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -223,6 +223,10 @@ builtin_filter(PyObject *self, PyObject *args) /* Guess a result list size. */ len = PyObject_Size(seq); if (len < 0) { + if (!PyErr_ExceptionMatches(PyExc_TypeError) && + !PyErr_ExceptionMatches(PyExc_AttributeError)) { + goto Fail_it; + } PyErr_Clear(); len = 8; /* arbitrary */ } @@ -864,6 +868,10 @@ builtin_map(PyObject *self, PyObject *args) /* Update len. */ curlen = PyObject_Size(curseq); if (curlen < 0) { + if (!PyErr_ExceptionMatches(PyExc_TypeError) && + !PyErr_ExceptionMatches(PyExc_AttributeError)) { + goto Fail_2; + } PyErr_Clear(); curlen = 8; /* arbitrary */ } @@ -2097,6 +2105,10 @@ builtin_zip(PyObject *self, PyObject *args) PyObject *item = PyTuple_GET_ITEM(args, i); int thislen = PyObject_Size(item); if (thislen < 0) { + if (!PyErr_ExceptionMatches(PyExc_TypeError) && + !PyErr_ExceptionMatches(PyExc_AttributeError)) { + return NULL; + } PyErr_Clear(); len = -1; break; |