From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 12 Aug 2006 03:16:54 +0000 (+0000)
Subject: Check return of PyMem_MALLOC (garbage) is non-NULL.
X-Git-Tag: v2.5c1~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b88cfad3181ba2eb6537edeb9a7d067970178d69;p=python

Check return of PyMem_MALLOC (garbage) is non-NULL.
Check seq in both portions of if/else.

Klocwork #289-290.
---

diff --git a/Objects/listobject.c b/Objects/listobject.c
index e6bed7172a..f917385fa0 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2541,6 +2541,10 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
 
 			garbage = (PyObject**)
 				PyMem_MALLOC(slicelength*sizeof(PyObject*));
+			if (!garbage) {
+				PyErr_NoMemory();
+				return -1;
+			}
 
 			/* drawing pictures might help
 			   understand these for loops */
@@ -2589,9 +2593,9 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
 			else {
 				seq = PySequence_Fast(value,
 					"must assign iterable to extended slice");
-				if (!seq)
-					return -1;
 			}
+			if (!seq)
+				return -1;
 
 			if (PySequence_Fast_GET_SIZE(seq) != slicelength) {
 				PyErr_Format(PyExc_ValueError,