diff options
| -rw-r--r-- | Lib/test/test_descr.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2019-05-27-18-00-19.bpo-26423.RgUOE8.rst | 2 | ||||
| -rw-r--r-- | Objects/typeobject.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index e37a98417f..6b018ccc56 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -389,6 +389,10 @@ class OperatorsTest(unittest.TestCase): a.setstate(100) self.assertEqual(a.getstate(), 100) + def test_wrap_lenfunc_bad_cast(self): + self.assertEqual(range(sys.maxsize).__len__(), sys.maxsize) + + class ClassPropertiesAndMethods(unittest.TestCase): def assertHasAttr(self, obj, name): diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-05-27-18-00-19.bpo-26423.RgUOE8.rst b/Misc/NEWS.d/next/Core and Builtins/2019-05-27-18-00-19.bpo-26423.RgUOE8.rst new file mode 100644 index 0000000000..6bf2031a33 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-05-27-18-00-19.bpo-26423.RgUOE8.rst @@ -0,0 +1,2 @@ +Fix possible overflow in ``wrap_lenfunc()`` when +``sizeof(long) < sizeof(Py_ssize_t)`` (e.g., 64-bit Windows). diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 06e045bd15..c14cbad875 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -5536,7 +5536,7 @@ wrap_lenfunc(PyObject *self, PyObject *args, void *wrapped) res = (*func)(self); if (res == -1 && PyErr_Occurred()) return NULL; - return PyLong_FromLong((long)res); + return PyLong_FromSsize_t(res); } static PyObject * |