Kaydet (Commit) ccc56c7c authored tarafından Neal Norwitz's avatar Neal Norwitz

Really address the issue of where to place the assert for leftblock.

(Followup of Klocwork 274)
üst 20745b1a
...@@ -211,6 +211,7 @@ deque_popleft(dequeobject *deque, PyObject *unused) ...@@ -211,6 +211,7 @@ deque_popleft(dequeobject *deque, PyObject *unused)
PyErr_SetString(PyExc_IndexError, "pop from an empty deque"); PyErr_SetString(PyExc_IndexError, "pop from an empty deque");
return NULL; return NULL;
} }
assert(deque->leftblock != NULL);
item = deque->leftblock->data[deque->leftindex]; item = deque->leftblock->data[deque->leftindex];
deque->leftindex++; deque->leftindex++;
deque->len--; deque->len--;
...@@ -224,7 +225,6 @@ deque_popleft(dequeobject *deque, PyObject *unused) ...@@ -224,7 +225,6 @@ deque_popleft(dequeobject *deque, PyObject *unused)
deque->leftindex = CENTER + 1; deque->leftindex = CENTER + 1;
deque->rightindex = CENTER; deque->rightindex = CENTER;
} else { } else {
assert(deque->leftblock != NULL);
assert(deque->leftblock != deque->rightblock); assert(deque->leftblock != deque->rightblock);
prevblock = deque->leftblock->rightlink; prevblock = deque->leftblock->rightlink;
PyMem_Free(deque->leftblock); PyMem_Free(deque->leftblock);
......
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