From: Andrew M. Kuchling <amk@amk.ca>
Date: Thu, 5 Oct 2006 17:22:15 +0000 (+0000)
Subject: [Backport r51224 | neal.norwitz]
X-Git-Tag: v2.4.4c1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=165e797817b9bc1237a694790142f6eb97fdf31d;p=thirdparty%2FPython%2Fcpython.git

[Backport r51224 | neal.norwitz]

Move the assert which checks for a NULL pointer first.
Klocwork #274.
---

diff --git a/Modules/collectionsmodule.c b/Modules/collectionsmodule.c
index 4457551bb0a9..3387b99365f6 100644
--- a/Modules/collectionsmodule.c
+++ b/Modules/collectionsmodule.c
@@ -225,9 +225,9 @@ 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;
-			assert(deque->leftblock != NULL);
 			PyMem_Free(deque->leftblock);
 			assert(prevblock != NULL);
 			prevblock->leftlink = NULL;