mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-21 22:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.2 (#24044)

Browse source
This commit is contained in:
Benjamin Peterson 2015-04-23 17:05:07 -04:00
commit 51454a62e2
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Objects/listobject.c
View file

@ -1953,8 +1953,10 @@ listsort(PyListObject *self, PyObject *args, PyObject *kwds)
keys = &ms.temparray[saved_ob_size+1];
else {
keys = PyMem_MALLOC(sizeof(PyObject *) * saved_ob_size);
if (keys == NULL)
return NULL;
if (keys == NULL) {
PyErr_NoMemory();
goto keyfunc_fail;
}
}
for (i = 0; i < saved_ob_size ; i++) {