mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 17:25:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-29839: Raise ValueError rather than OverflowError in len() for negative values. (#701)

Browse source
This commit is contained in:
Serhiy Storchaka 2017-04-16 09:37:18 +03:00 • committed by GitHub
parent 813f943c59
commit baf9f29811
3 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Objects/typeobject.c
View file

@ -5924,14 +5924,21 @@ slot_sq_length(PyObject *self)
if (res == NULL)
return -1;
len = PyNumber_AsSsize_t(res, PyExc_OverflowError);
Py_DECREF(res);
if (len < 0) {
if (!PyErr_Occurred())
PyErr_SetString(PyExc_ValueError,
"__len__() should return >= 0");
Py_SETREF(res, PyNumber_Index(res));
if (res == NULL)
return -1;
assert(PyLong_Check(res));
if (Py_SIZE(res) < 0) {
PyErr_SetString(PyExc_ValueError,
"__len__() should return >= 0");
return -1;
}
len = PyNumber_AsSsize_t(res, PyExc_OverflowError);
assert(len >= 0 || PyErr_ExceptionMatches(PyExc_OverflowError));
Py_DECREF(res);
return len;
}