#11335: Fix memory leak after key function failure in sort

Daniel Stutzbach · Daniel Stutzbach · commit eda70b81d334 · 2011-05-04T12:46:28.000-07:00
diff --git a/Lib/test/test_sort.py b/Lib/test/test_sort.py
@@ -111,6 +111,12 @@ def __repr__(self):
             s.sort(key=CmpToKey(lambda a, b:  int(random.random() * 3) - 1))
             check("an insane function left some permutation", x, s)
 
+            if len(x) >= 2:
+                def bad_key(x):
+                    raise RuntimeError
+                s = x[:]
+                self.assertRaises(RuntimeError, s.sort, key=bad_key)
+
             x = [Complains(i) for i in x]
             s = x[:]
             random.shuffle(s)
diff --git a/Objects/listobject.c b/Objects/listobject.c
@@ -1944,6 +1944,8 @@ listsort(PyListObject *self, PyObject *args, PyObject *kwds)
             if (keys[i] == NULL) {
                 for (i=i-1 ; i>=0 ; i--)
                     Py_DECREF(keys[i]);
+                if (keys != &ms.temparray[saved_ob_size+1])
+                    PyMem_FREE(keys);
                 goto keyfunc_fail;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1944,6 +1944,8 @@ listsort(PyListObject self, PyObject args, PyObject *kwds)`
`1944`	`1944`	`if (keys[i] == NULL) {`
`1945`	`1945`	`for (i=i-1 ; i>=0 ; i--)`
`1946`	`1946`	`Py_DECREF(keys[i]);`
	`1947`	`+ if (keys != &ms.temparray[saved_ob_size+1])`
	`1948`	`+ PyMem_FREE(keys);`
`1947`	`1949`	`goto keyfunc_fail;`
`1948`	`1950`	`}`
`1949`	`1951`	`}`