Issue 1242657: list(obj) can swallow KeyboardInterrupt
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 956c4f4..c10f4ca 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -85,8 +85,8 @@
/* The length hint function returns a non-negative value from o.__len__()
or o.__length_hint__(). If those methods aren't found or return a negative
- value, then the defaultvalue is returned. This function never fails.
- Accordingly, it will mask exceptions raised in either method.
+ value, then the defaultvalue is returned. If one of the calls fails,
+ this function returns -1.
*/
Py_ssize_t
@@ -100,29 +100,32 @@
rv = PyObject_Size(o);
if (rv >= 0)
return rv;
- if (PyErr_Occurred())
+ if (PyErr_Occurred()) {
+ if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
+ !PyErr_ExceptionMatches(PyExc_AttributeError))
+ return -1;
PyErr_Clear();
+ }
/* cache a hashed version of the attribute string */
if (hintstrobj == NULL) {
hintstrobj = PyString_InternFromString("__length_hint__");
if (hintstrobj == NULL)
- goto defaultcase;
+ return -1;
}
/* try o.__length_hint__() */
ro = PyObject_CallMethodObjArgs(o, hintstrobj, NULL);
- if (ro == NULL)
- goto defaultcase;
+ if (ro == NULL) {
+ if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
+ !PyErr_ExceptionMatches(PyExc_AttributeError))
+ return -1;
+ PyErr_Clear();
+ return defaultvalue;
+ }
rv = PyInt_AsLong(ro);
Py_DECREF(ro);
- if (rv >= 0)
- return rv;
-
-defaultcase:
- if (PyErr_Occurred())
- PyErr_Clear();
- return defaultvalue;
+ return rv;
}
PyObject *
@@ -2114,7 +2117,7 @@
{
PyObject *it; /* iter(v) */
Py_ssize_t n; /* guess for result tuple size */
- PyObject *result;
+ PyObject *result = NULL;
Py_ssize_t j;
if (v == NULL)
@@ -2139,6 +2142,8 @@
/* Guess result size and allocate space. */
n = _PyObject_LengthHint(v, 10);
+ if (n == -1)
+ goto Fail;
result = PyTuple_New(n);
if (result == NULL)
goto Fail;