Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-26423: Fix possible overflow in wrap_lenfunc() (GH-13606) 

Fix possible overflow in wrap_lenfunc() when
sizeof(long) < sizeof(Py_ssize_t) (e.g., 64-bit Windows).
This commit is contained in:
Zackery Spytz 2019-05-28 06:55:29 -06:00 committed by Victor Stinner
parent 04530812e9
commit 05f16416d9
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_descr.py
View File

@ -389,6 +389,10 @@ class OperatorsTest(unittest.TestCase):
a.setstate(100) a.setstate(100)
self.assertEqual(a.getstate(), 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): class ClassPropertiesAndMethods(unittest.TestCase):
def assertHasAttr(self, obj, name): def assertHasAttr(self, obj, name):

2
Misc/NEWS.d/next/Core and Builtins/2019-05-27-18-00-19.bpo-26423.RgUOE8.rst Normal file
View File

@ -0,0 +1,2 @@
Fix possible overflow in ``wrap_lenfunc()`` when
``sizeof(long) < sizeof(Py_ssize_t)`` (e.g., 64-bit Windows).

2
Objects/typeobject.c
View File

@ -5536,7 +5536,7 @@ wrap_lenfunc(PyObject *self, PyObject *args, void *wrapped)
res = (*func)(self); res = (*func)(self);
if (res == -1 && PyErr_Occurred()) if (res == -1 && PyErr_Occurred())
return NULL; return NULL;
return PyLong_FromLong((long)res); return PyLong_FromSsize_t(res);
} }
static PyObject * static PyObject *