diff options
| -rw-r--r-- | Objects/abstract.c | 32 | ||||
| -rw-r--r-- | Objects/typeobject.c | 4 | ||||
| -rw-r--r-- | Python/bltinmodule.c | 4 |
3 files changed, 29 insertions, 11 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index 4a75b92..0f1ee9d 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -52,8 +52,11 @@ PyObject_Size(PyObject *o) } m = o->ob_type->tp_as_sequence; - if (m && m->sq_length) - return m->sq_length(o); + if (m && m->sq_length) { + Py_ssize_t len = m->sq_length(o); + assert(len >= 0 || PyErr_Occurred()); + return len; + } return PyMapping_Size(o); } @@ -86,7 +89,8 @@ PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue) _Py_IDENTIFIER(__length_hint__); if (_PyObject_HasLen(o)) { res = PyObject_Length(o); - if (res < 0 && PyErr_Occurred()) { + if (res < 0) { + assert(PyErr_Occurred()); if (!PyErr_ExceptionMatches(PyExc_TypeError)) { return -1; } @@ -1483,8 +1487,11 @@ PySequence_Size(PyObject *s) } m = s->ob_type->tp_as_sequence; - if (m && m->sq_length) - return m->sq_length(s); + if (m && m->sq_length) { + Py_ssize_t len = m->sq_length(s); + assert(len >= 0 || PyErr_Occurred()); + return len; + } type_error("object of type '%.200s' has no len()", s); return -1; @@ -1673,8 +1680,10 @@ PySequence_SetItem(PyObject *s, Py_ssize_t i, PyObject *o) if (i < 0) { if (m->sq_length) { Py_ssize_t l = (*m->sq_length)(s); - if (l < 0) + if (l < 0) { + assert(PyErr_Occurred()); return -1; + } i += l; } } @@ -1700,8 +1709,10 @@ PySequence_DelItem(PyObject *s, Py_ssize_t i) if (i < 0) { if (m->sq_length) { Py_ssize_t l = (*m->sq_length)(s); - if (l < 0) + if (l < 0) { + assert(PyErr_Occurred()); return -1; + } i += l; } } @@ -2038,8 +2049,11 @@ PyMapping_Size(PyObject *o) } m = o->ob_type->tp_as_mapping; - if (m && m->mp_length) - return m->mp_length(o); + if (m && m->mp_length) { + Py_ssize_t len = m->mp_length(o); + assert(len >= 0 || PyErr_Occurred()); + return len; + } type_error("object of type '%.200s' has no len()", o); return -1; diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 369c72f..ed50946 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -5427,8 +5427,10 @@ getindex(PyObject *self, PyObject *arg) PySequenceMethods *sq = Py_TYPE(self)->tp_as_sequence; if (sq && sq->sq_length) { Py_ssize_t n = (*sq->sq_length)(self); - if (n < 0) + if (n < 0) { + assert(PyErr_Occurred()); return -1; + } i += n; } } diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 8ae2303..60d1b7c 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1479,8 +1479,10 @@ builtin_len(PyObject *module, PyObject *obj) Py_ssize_t res; res = PyObject_Size(obj); - if (res < 0 && PyErr_Occurred()) + if (res < 0) { + assert(PyErr_Occurred()); return NULL; + } return PyLong_FromSsize_t(res); } |