summaryrefslogtreecommitdiff
path: root/Objects/listobject.c
diff options
context:
space:
mode:
Diffstat (limited to 'Objects/listobject.c')
-rw-r--r--Objects/listobject.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 08ab0951c9..3b7358a312 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -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 */
}