bpo-29838: Add asserts for checking results of sq_length and mq_length slots. (#700)
Negative result should be returned only when an error is set.
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 @@
}
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 @@
_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 @@
}
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 @@
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 @@
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 @@
}
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;