diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2007-12-04 06:20:30 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2007-12-04 06:20:30 (GMT) |
| commit | 79a082b7159d697f6b63e967f18e18cee0c82db7 (patch) | |
| tree | f8e9895453f3fbccceadc8b7618a58a1a21791cf | |
| parent | a74169b7c13bb081380a463541e80b7ba6934abd (diff) | |
| download | cpython-79a082b7159d697f6b63e967f18e18cee0c82db7.zip cpython-79a082b7159d697f6b63e967f18e18cee0c82db7.tar.gz cpython-79a082b7159d697f6b63e967f18e18cee0c82db7.tar.bz2 | |
Fix issue #1553: An errornous __length_hint__ can make list() raise a
SystemError.
| -rw-r--r-- | Objects/abstract.c | 5 | ||||
| -rw-r--r-- | Objects/listobject.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index 965d088..df5da5f 100644 --- 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; } diff --git a/Objects/listobject.c b/Objects/listobject.c index 43e8a3f..59674bf 100644 --- 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; } |