diff options
| author | Raymond Hettinger <python@rcn.com> | 2005-08-21 11:03:59 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2005-08-21 11:03:59 (GMT) |
| commit | a710b331daee9e79ca90395feb6ce8c552e00568 (patch) | |
| tree | a00e825052dabf853c875136b3e1832742634879 /Python | |
| parent | b285974c00fbf51af727d9330fa90443177390f4 (diff) | |
| download | cpython-a710b331daee9e79ca90395feb6ce8c552e00568.zip cpython-a710b331daee9e79ca90395feb6ce8c552e00568.tar.gz cpython-a710b331daee9e79ca90395feb6ce8c552e00568.tar.bz2 | |
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().
Diffstat (limited to 'Python')
| -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 f63e27a..af5a55b 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; |