merge 3.3 (#24044)

benjaminp · benjaminp · commit bd91ee9cd78a · 2015-04-23T17:06:33.000-04:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -28,6 +28,9 @@ Core and Builtins
 - Issue #23629: Fix the default __sizeof__ implementation for variable-sized
   objects.
 
+- Issue #24044: Fix possible null pointer dereference in list.sort in out of
+  memory conditions.
+
 Library
 -------
 
diff --git a/Objects/listobject.c b/Objects/listobject.c
@@ -1961,8 +1961,10 @@ listsort(PyListObject *self, PyObject *args, PyObject *kwds)
             keys = &ms.temparray[saved_ob_size+1];
         else {
             keys = PyMem_MALLOC(sizeof(PyObject *) * saved_ob_size);
-            if (keys == NULL)
-                return NULL;
+            if (keys == NULL) {
+                PyErr_NoMemory();
+                goto keyfunc_fail;
+            }
         }
 
         for (i = 0; i < saved_ob_size ; i++) {
