Skip to content

Commit 80dfe99

Browse files
authored
bpo-26423: Fix possible overflow in wrap_lenfunc() (GH-13606) (GH-13625)
Fix possible overflow in wrap_lenfunc() when sizeof(long) < sizeof(Py_ssize_t) (e.g., 64-bit Windows). (cherry picked from commit 05f1641)
1 parent d9d1045 commit 80dfe99

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

Lib/test/test_descr.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,10 @@ def foo(self): return 1
403403
a.setstate(100)
404404
self.assertEqual(a.getstate(), 100)
405405

406+
def test_wrap_lenfunc_bad_cast(self):
407+
self.assertEqual(xrange(sys.maxsize).__len__(), sys.maxsize)
408+
409+
406410
class ClassPropertiesAndMethods(unittest.TestCase):
407411

408412
def assertHasAttr(self, obj, name):
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix possible overflow in ``wrap_lenfunc()`` when
2+
``sizeof(long) < sizeof(Py_ssize_t)`` (e.g., 64-bit Windows).

Objects/typeobject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4398,7 +4398,7 @@ wrap_lenfunc(PyObject *self, PyObject *args, void *wrapped)
43984398
res = (*func)(self);
43994399
if (res == -1 && PyErr_Occurred())
44004400
return NULL;
4401-
return PyInt_FromLong((long)res);
4401+
return PyInt_FromSsize_t(res);
44024402
}
44034403

44044404
static PyObject *

0 commit comments

Comments
 (0)