diff options
| author | Brett Cannon <brett@python.org> | 2015-09-03 17:15:03 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2015-09-03 17:15:03 (GMT) |
| commit | df6b544ff6f342e8a64056e627867a70413bfdb0 (patch) | |
| tree | ba995c65afefd06ff9e890303d2fef6ed3fbe702 | |
| parent | b3d531348c40b195e6bb742d956ea749b3f7a969 (diff) | |
| download | cpython-df6b544ff6f342e8a64056e627867a70413bfdb0.zip cpython-df6b544ff6f342e8a64056e627867a70413bfdb0.tar.gz cpython-df6b544ff6f342e8a64056e627867a70413bfdb0.tar.bz2 | |
Issue #24913: Fix overrun error in deque.index().
Reported by John Leitch and Bryce Darling, patch by Raymond Hettinger.
| -rw-r--r-- | Lib/test/test_deque.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_collectionsmodule.c | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py index b858509..8718716 100644 --- a/Lib/test/test_deque.py +++ b/Lib/test/test_deque.py @@ -289,6 +289,11 @@ class TestBasic(unittest.TestCase): else: self.assertEqual(d.index(element, start, stop), target) + def test_insert_bug_24913(self): + d = deque('A' * 3) + with self.assertRaises(ValueError): + i = d.index("Hello world", 0, 4) + def test_insert(self): # Test to make sure insert behaves like lists elements = 'ABCDEFGHI' @@ -15,6 +15,9 @@ Core and Builtins Library ------- +- Issue #24913: Fix overrun error in deque.index(). + Found by John Leitch and Bryce Darling. + What's New in Python 3.5.0 release candidate 2? =============================================== diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 830c5b8..3856d83 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -924,6 +924,8 @@ deque_index(dequeobject *deque, PyObject *args) if (stop < 0) stop = 0; } + if (stop > Py_SIZE(deque)) + stop = Py_SIZE(deque); for (i=0 ; i<stop ; i++) { if (i >= start) { |