summaryrefslogtreecommitdiffstats
path: root/Objects/listobject.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-04-23 21:04:36 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-04-23 21:04:36 (GMT)
commit0823ffb2fb16aa29cefd4c1b91edd82d9814e46a (patch)
treed9e0c15afd1ae9ab0024317a2195b6636f6249d7 /Objects/listobject.c
parent893cce921cf99bac08f14fb92426bd8e191e9c79 (diff)
downloadcpython-0823ffb2fb16aa29cefd4c1b91edd82d9814e46a.zip
cpython-0823ffb2fb16aa29cefd4c1b91edd82d9814e46a.tar.gz
cpython-0823ffb2fb16aa29cefd4c1b91edd82d9814e46a.tar.bz2
properly handle malloc failure (closes #24044)
Patch by Christian Heimes.
Diffstat (limited to 'Objects/listobject.c')
-rw-r--r--Objects/listobject.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c
index b9ef0d0..3642b39 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1924,8 +1924,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++) {