mirror of https://github.com/python/cpython
merge 3.2 (#24044)
This commit is contained in:
commit
51454a62e2
|
@ -10,6 +10,9 @@ What's New in Python 3.3.7?
|
|||
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
|
||||
and fix by Guido Vranken.
|
||||
|
||||
|
|
|
@ -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++) {
|
||||
|
|
Loading…
Reference in New Issue