]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Really address the issue of where to place the assert for leftblock.
authorNeal Norwitz <nnorwitz@gmail.com>
Sun, 13 Aug 2006 18:13:02 +0000 (18:13 +0000)
committerNeal Norwitz <nnorwitz@gmail.com>
Sun, 13 Aug 2006 18:13:02 +0000 (18:13 +0000)
(Followup of Klocwork 274)

Modules/collectionsmodule.c

index aef5d710c10778bf28ba3d9f928d3496540ae051..c1bd732b322670b60ee1582f55b2742a8d4dec16 100644 (file)
@@ -211,6 +211,7 @@ deque_popleft(dequeobject *deque, PyObject *unused)
                PyErr_SetString(PyExc_IndexError, "pop from an empty deque");
                return NULL;
        }
+       assert(deque->leftblock != NULL);
        item = deque->leftblock->data[deque->leftindex];
        deque->leftindex++;
        deque->len--;
@@ -224,7 +225,6 @@ deque_popleft(dequeobject *deque, PyObject *unused)
                        deque->leftindex = CENTER + 1;
                        deque->rightindex = CENTER;
                } else {
-                       assert(deque->leftblock != NULL);
                        assert(deque->leftblock != deque->rightblock);
                        prevblock = deque->leftblock->rightlink;
                        PyMem_Free(deque->leftblock);