Commit ac13ad6a authored by Raymond Hettinger's avatar Raymond Hettinger

For safety, wait to decref deleted values until the deque state has been restored.

parent 0f6f9477
......@@ -864,9 +864,9 @@ deque_remove(dequeobject *deque, PyObject *value)
if (cmp > 0) {
PyObject *tgt = deque_popleft(deque, NULL);
assert (tgt != NULL);
Py_DECREF(tgt);
if (_deque_rotate(deque, i) == -1)
return NULL;
Py_DECREF(tgt);
Py_RETURN_NONE;
}
else if (cmp < 0) {
......@@ -956,16 +956,16 @@ static int
deque_del_item(dequeobject *deque, Py_ssize_t i)
{
PyObject *item;
int rv;
assert (i >= 0 && i < Py_SIZE(deque));
if (_deque_rotate(deque, -i) == -1)
return -1;
item = deque_popleft(deque, NULL);
rv = _deque_rotate(deque, i);
assert (item != NULL);
Py_DECREF(item);
return _deque_rotate(deque, i);
return rv;
}
static int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment