[Backport r51230 | neal.norwitz]

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 b0bc6a8c3167f1b420f6cffcc7d935bf7e5066bd..40d46203d2235a9053af6da7aa5e945c333fee6f 100644 (file)
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2550,6 +2550,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 */
@@ -2598,9 +2602,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,