1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ What's New in Python 3.3.7?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #24044: Fix possible null pointer dereference in list.sort in out of
memory conditions.
- Issue #23055: Fixed a buffer overflow in PyUnicode_FromFormatV. Analysis - Issue #23055: Fixed a buffer overflow in PyUnicode_FromFormatV. Analysis
and fix by Guido Vranken. and fix by Guido Vranken.

6
Objects/listobject.c
View File

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