https://github.com/python/cpython/commit/6e3bb8a91380ba98d704f2dca8e98923c0abc8a8
commit: 6e3bb8a91380ba98d704f2dca8e98923c0abc8a8
branch: main
author: Bénédikt Tran <[email protected]>
committer: vstinner <[email protected]>
date: 2024-11-12T14:10:10+01:00
summary:
gh-126595: fix a crash when calling `itertools.count(sys.maxsize)` (#126617)
files:
A Misc/NEWS.d/next/Library/2024-11-09-10-31-10.gh-issue-126595.A-7MyC.rst
M Lib/test/test_itertools.py
M Modules/itertoolsmodule.c
diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py
index a52e1d3fa142d9..b94d688738f9e8 100644
--- a/Lib/test/test_itertools.py
+++ b/Lib/test/test_itertools.py
@@ -494,6 +494,8 @@ def test_count(self):
self.assertEqual(take(2, zip('abc',count(-3))), [('a', -3), ('b', -2)])
self.assertRaises(TypeError, count, 2, 3, 4)
self.assertRaises(TypeError, count, 'a')
+ self.assertEqual(take(3, count(maxsize)),
+ [maxsize, maxsize + 1, maxsize + 2])
self.assertEqual(take(10, count(maxsize-5)),
list(range(maxsize-5, maxsize+5)))
self.assertEqual(take(10, count(-maxsize-5)),
@@ -540,6 +542,12 @@ def test_count_with_step(self):
self.assertEqual(take(20, count(-maxsize-15, 3)), take(20,
range(-maxsize-15,-maxsize+100, 3)))
self.assertEqual(take(3, count(10, maxsize+5)),
list(range(10, 10+3*(maxsize+5), maxsize+5)))
+ self.assertEqual(take(3, count(maxsize, 2)),
+ [maxsize, maxsize + 2, maxsize + 4])
+ self.assertEqual(take(3, count(maxsize, maxsize)),
+ [maxsize, 2 * maxsize, 3 * maxsize])
+ self.assertEqual(take(3, count(-maxsize, maxsize)),
+ [-maxsize, 0, maxsize])
self.assertEqual(take(3, count(2, 1.25)), [2, 3.25, 4.5])
self.assertEqual(take(3, count(2, 3.25-4j)), [2, 5.25-4j, 8.5-8j])
self.assertEqual(take(3, count(Decimal('1.1'), Decimal('.1'))),
diff --git
a/Misc/NEWS.d/next/Library/2024-11-09-10-31-10.gh-issue-126595.A-7MyC.rst
b/Misc/NEWS.d/next/Library/2024-11-09-10-31-10.gh-issue-126595.A-7MyC.rst
new file mode 100644
index 00000000000000..84a5dc0b23922f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-11-09-10-31-10.gh-issue-126595.A-7MyC.rst
@@ -0,0 +1,2 @@
+Fix a crash when instantiating :class:`itertools.count` with an initial
+count of :data:`sys.maxsize` on debug builds. Patch by Bénédikt Tran.
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index 1201fa094902d7..78fbdcdf77a923 100644
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -3291,6 +3291,9 @@ itertools_count_impl(PyTypeObject *type, PyObject
*long_cnt,
PyErr_Clear();
fast_mode = 0;
}
+ else if (cnt == PY_SSIZE_T_MAX) {
+ fast_mode = 0;
+ }
}
} else {
cnt = 0;
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
