Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Lib/test/test_deque.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def test_contains(self):
with self.assertRaises(RuntimeError):
n in d

def test_contains_count_stop_crashes(self):
def test_contains_count_index_stop_crashes(self):
class A:
def __eq__(self, other):
d.clear()
Expand All @@ -178,6 +178,10 @@ def __eq__(self, other):
with self.assertRaises(RuntimeError):
_ = d.count(3)

d = deque([A()])
with self.assertRaises(RuntimeError):
d.index(0)

def test_extend(self):
d = deque('a')
self.assertRaises(TypeError, d.extend, 1)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix possible crashes in :meth:`collections.deque.index` when the deque is concurrently modified.
3 changes: 2 additions & 1 deletion Modules/_collectionsmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1218,8 +1218,9 @@ deque_index_impl(dequeobject *deque, PyObject *v, Py_ssize_t start,
n = stop - i;
while (--n >= 0) {
CHECK_NOT_END(b);
item = b->data[index];
item = Py_NewRef(b->data[index]);
cmp = PyObject_RichCompareBool(item, v, Py_EQ);
Py_DECREF(item);
if (cmp > 0)
return PyLong_FromSsize_t(stop - n - 1);
if (cmp < 0)
Expand Down