diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-03-15 17:21:47 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-03-15 17:21:47 (GMT) |
| commit | af9049ebbc371333219bdf2b62c27a889706b12d (patch) | |
| tree | 67a1ab03a9738932ed59a2b6eb884b555824c112 /Objects/listobject.c | |
| parent | 466eaaa5d107d0adcfc194d5d94e346a6b807c9d (diff) | |
| parent | 4a42cd48d57d67362301ee4ac0344199217fa645 (diff) | |
| download | cpython-af9049ebbc371333219bdf2b62c27a889706b12d.zip cpython-af9049ebbc371333219bdf2b62c27a889706b12d.tar.gz cpython-af9049ebbc371333219bdf2b62c27a889706b12d.tar.bz2 | |
merge 3.3
Diffstat (limited to 'Objects/listobject.c')
| -rw-r--r-- | Objects/listobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c index f0dc77d..fd5a72a 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -1970,7 +1970,7 @@ 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]) + if (saved_ob_size >= MERGESTATE_TEMP_SIZE/2) PyMem_FREE(keys); goto keyfunc_fail; } |