changeset:   95789:bd656916586f
parent:      95785:d1b706e57fbe
parent:      95788:80485b8e43cd
user:        Benjamin Peterson <benjamin@python.org>
date:        Thu Apr 23 17:06:45 2015 -0400
files:       Misc/NEWS Objects/listobject.c
description:
merge 3.4 (#24044)


diff -r d1b706e57fbe -r bd656916586f Misc/NEWS
--- a/Misc/NEWS	Thu Apr 23 11:25:41 2015 +0200
+++ b/Misc/NEWS	Thu Apr 23 17:06:45 2015 -0400
@@ -78,6 +78,9 @@
 - Issue #23466: %c, %o, %x, and %X in bytes formatting now raise TypeError on
   non-integer input.
 
+- Issue #24044: Fix possible null pointer dereference in list.sort in out of
+  memory conditions.
+
 Library
 -------
 
diff -r d1b706e57fbe -r bd656916586f Objects/listobject.c
--- a/Objects/listobject.c	Thu Apr 23 11:25:41 2015 +0200
+++ b/Objects/listobject.c	Thu Apr 23 17:06:45 2015 -0400
@@ -1961,8 +1961,10 @@
             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++) {