http://hg.python.org/cpython/rev/5c1bacba828d changeset: 89669:5c1bacba828d parent: 89667:85cb7c37503e parent: 89668:f5e9495df22f user: Benjamin Peterson <benjamin at python.org> date: Sat Mar 15 12:21:47 2014 -0500 summary: merge 3.3 files: Objects/listobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/listobject.c b/Objects/listobject.c --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -1970,7 +1970,7 @@ if (keys[i] == NULL) { for (i=i-1 ; i>=0 ; i--) Py_DECREF(keys[i]); - if (keys != &ms.temparray[saved_ob_size+1]) + if (saved_ob_size >= MERGESTATE_TEMP_SIZE/2) PyMem_FREE(keys); goto keyfunc_fail; } -- Repository URL: http://hg.python.org/cpython