summaryrefslogtreecommitdiff
path: root/Objects/listobject.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-03-15 12:21:28 -0500
committerBenjamin Peterson <benjamin@python.org>2014-03-15 12:21:28 -0500
commit54ac1ddd428350cbad5f4300bf94dedb75488ec8 (patch)
tree64ecba56ba92fe951f816b2933ca8092e5c43708 /Objects/listobject.c
parentda6f15d7f523f4955abc781ed2b77121f06c1a3c (diff)
downloadcpython-54ac1ddd428350cbad5f4300bf94dedb75488ec8.tar.gz
avoid referencing past the bounds of an array
Diffstat (limited to 'Objects/listobject.c')
-rw-r--r--Objects/listobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 5f3e282827..ae365770ea 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;
}