diff options
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/classobject.c | 2 | ||||
| -rw-r--r-- | Objects/typeobject.c | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Objects/classobject.c b/Objects/classobject.c index f778387..ddec3e4 100644 --- a/Objects/classobject.c +++ b/Objects/classobject.c @@ -1019,7 +1019,7 @@ instance_length(PyInstanceObject *inst) /* Overflow check -- range of PyInt is more than C int */ if (outcome != temp) { PyErr_SetString(PyExc_OverflowError, - "__len__() should return 0 <= outcome < 2**32"); + "__len__() should return 0 <= outcome < 2**31"); outcome = -1; } else diff --git a/Objects/typeobject.c b/Objects/typeobject.c index d9146d8..41488a4 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -4071,14 +4071,24 @@ slot_sq_length(PyObject *self) { static PyObject *len_str; PyObject *res = call_method(self, "__len__", &len_str, "()"); + long temp; int len; if (res == NULL) return -1; - len = (int)PyInt_AsLong(res); + temp = PyInt_AsLong(res); + len = (int)temp; Py_DECREF(res); if (len == -1 && PyErr_Occurred()) return -1; +#if SIZEOF_INT < SIZEOF_LONG + /* Overflow check -- range of PyInt is more than C int */ + if (len != temp) { + PyErr_SetString(PyExc_OverflowError, + "__len__() should return 0 <= outcome < 2**31"); + return -1; + } +#endif if (len < 0) { PyErr_SetString(PyExc_ValueError, "__len__() should return >= 0"); |