summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-03-15 17:21:28 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-03-15 17:21:28 (GMT)
commit4a42cd48d57d67362301ee4ac0344199217fa645 (patch)
treea80d9550d2f614504f9c41f208ce0d1b08cc7861 /Objects
parentc77e7a4f233453a4e39fc7f61c72e6ef3877dcd1 (diff)
downloadcpython-4a42cd48d57d67362301ee4ac0344199217fa645.zip
cpython-4a42cd48d57d67362301ee4ac0344199217fa645.tar.gz
cpython-4a42cd48d57d67362301ee4ac0344199217fa645.tar.bz2
avoid referencing past the bounds of an array
Diffstat (limited to 'Objects')
-rw-r--r--Objects/listobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 5f3e282..ae36577 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1963,7 +1963,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;
}