merge 3.3

benjaminp · benjaminp · commit 1aca78da621f · 2014-03-14T21:54:41.000-05:00
diff --git a/Objects/listobject.c b/Objects/listobject.c
@@ -2043,7 +2043,7 @@ listsort(PyListObject *self, PyObject *args, PyObject *kwds)
     if (keys != NULL) {
         for (i = 0; i < saved_ob_size; i++)
             Py_DECREF(keys[i]);
-        if (keys != &ms.temparray[saved_ob_size+1])
+        if (saved_ob_size >= MERGESTATE_TEMP_SIZE/2)
             PyMem_FREE(keys);
     }
 
diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -37,8 +37,9 @@ Py_ssize_t quick_int_allocs, quick_neg_int_allocs;
 static PyObject *
 get_small_int(sdigit ival)
 {
+    PyObject *v;
     assert(-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS);
-    PyObject *v = (PyObject *)&small_ints[ival + NSMALLNEGINTS];
+    v = (PyObject *)&small_ints[ival + NSMALLNEGINTS];
     Py_INCREF(v);
 #ifdef COUNT_ALLOCS
     if (ival >= 0)

Original file line number	Diff line number	Diff line change
`@@ -2043,7 +2043,7 @@ listsort(PyListObject self, PyObject args, PyObject *kwds)`
`2043`	`2043`	`if (keys != NULL) {`
`2044`	`2044`	`for (i = 0; i < saved_ob_size; i++)`
`2045`	`2045`	`Py_DECREF(keys[i]);`
`2046`		`- if (keys != &ms.temparray[saved_ob_size+1])`
	`2046`	`+ if (saved_ob_size >= MERGESTATE_TEMP_SIZE/2)`
`2047`	`2047`	`PyMem_FREE(keys);`
`2048`	`2048`	`}`
`2049`	`2049`