Mercurial > cpython-lru_cache-weakref
diff Python/bltinmodule.c @ 35364:aeb8580a1af7 legacy-trunk
SF bug #1242657: list(obj) can swallow KeyboardInterrupt
Fix over-aggressive PyErr_Clear(). The same code fragment appears in
various guises in list.extend(), map(), filter(), zip(), and internally
in PySequence_Tuple().
| author | Raymond Hettinger <python@rcn.com> |
|---|---|
| date | Sun, 21 Aug 2005 11:03:59 +0000 |
| parents | b431ed7bcdc2 |
| children | 8fa83a9ebc6e |
line wrap: on
line diff
--- a/Python/bltinmodule.c Sun Aug 21 09:41:21 2005 +0000 +++ b/Python/bltinmodule.c Sun Aug 21 11:03:59 2005 +0000 @@ -223,6 +223,10 @@ /* 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 @@ /* 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 @@ 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;