Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 21:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

SF bug #1242657: list(obj) can swallow KeyboardInterrupt

Browse source 
Fix over-aggressive PyErr_Clear().  The same code fragment appears in
various guises in list.extend(), map(), filter(), zip(), and internally
in PySequence_Tuple().
This commit is contained in:
Raymond Hettinger 2005-08-21 11:03:59 +00:00
parent b285974c00
commit a710b331da
4 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/test/list_tests.py
View file

@ -514,3 +514,12 @@ def test_extendedslicing(self):
a = self.type2test(range(10))
a[::2] = tuple(range(5))
self.assertEqual(a, self.type2test([0, 1, 1, 3, 2, 5, 3, 7, 4, 9]))
def test_constructor_exception_handling(self):
# Bug #1242657
class F(object):
def __iter__(self):
yield 23
def __len__(self):
raise KeyboardInterrupt
self.assertRaises(KeyboardInterrupt, list, F())

5
Objects/abstract.c
View file

@ -1401,6 +1401,11 @@ PySequence_Tuple(PyObject *v)
/* Guess result size and allocate space. */
n = PyObject_Size(v);
if (n < 0) {
if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
!PyErr_ExceptionMatches(PyExc_AttributeError)) {
Py_DECREF(it);
return NULL;
}
PyErr_Clear();
n = 10; /* arbitrary */
}

5
Objects/listobject.c
View file

@ -777,6 +777,11 @@ listextend(PyListObject *self, PyObject *b)
/* Guess a result list size. */
n = PyObject_Size(b);
if (n < 0) {
if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
!PyErr_ExceptionMatches(PyExc_AttributeError)) {
Py_DECREF(it);
return NULL;
}
PyErr_Clear();
n = 8; /* arbitrary */
}

12
Python/bltinmodule.c
View file

@ -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;