Fix issue #1553: An errornous __length_hint__ can make list() raise a

SystemError.

Fix issue #1553: An errornous __length_hint__ can make list() raise a
SystemError.
a46d0096 · Alexandre Vassalotti · 4f414f5e · a46d0096 · a46d0096
Commit a46d0096 authored Dec 04, 2007 by Alexandre Vassalotti
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

Objects/abstract.c Objects/abstract.c +3 -2

Objects/listobject.c Objects/listobject.c +3 -2

No files found.
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1657,8 +1657,9 @@ PySequence_Tuple(PyObject *v)
 	/* Guess result size and allocate space. */
 	n = _PyObject_LengthHint(v);
 	if (n < 0) {
-		if (!PyErr_ExceptionMatches(PyExc_TypeError)  &&
-		    !PyErr_ExceptionMatches(PyExc_AttributeError)) {
+		if (PyErr_Occurred()
+		    && !PyErr_ExceptionMatches(PyExc_TypeError)
+		    && !PyErr_ExceptionMatches(PyExc_AttributeError)) {
 			Py_DECREF(it);
 			return NULL;
 		}

--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -760,8 +760,9 @@ listextend(PyListObject *self, PyObject *b)
 	/* Guess a result list size. */
 	n = _PyObject_LengthHint(b);
 	if (n < 0) {
-		if (!PyErr_ExceptionMatches(PyExc_TypeError)  &&
-		    !PyErr_ExceptionMatches(PyExc_AttributeError)) {
+		if (PyErr_Occurred()
+		    && !PyErr_ExceptionMatches(PyExc_TypeError)
+		    && !PyErr_ExceptionMatches(PyExc_AttributeError)) {
 			Py_DECREF(it);
 			return NULL;
 		}