From: Victor Stinner Date: Thu, 11 Jul 2013 22:42:14 +0000 (+0200) Subject: Issue #18408: pmerge() help of mro_implementation() now raises MemoryError on X-Git-Tag: v3.4.0a1~240 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a41f08514463ffe1f985e1ef5b3e9123e7222dc5;p=python Issue #18408: pmerge() help of mro_implementation() now raises MemoryError on memory allocation failure Replace also PyMem_Free() with PyMem_FREE() to be consistent with the rest of the function. --- diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 6eb2cf1103..560c929b73 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1456,8 +1456,10 @@ pmerge(PyObject *acc, PyObject* to_merge) { that is not included in acc. */ remain = (int *)PyMem_MALLOC(SIZEOF_INT*to_merge_size); - if (remain == NULL) + if (remain == NULL) { + PyErr_NoMemory(); return -1; + } for (i = 0; i < to_merge_size; i++) remain[i] = 0; @@ -1489,7 +1491,7 @@ pmerge(PyObject *acc, PyObject* to_merge) { } ok = PyList_Append(acc, candidate); if (ok < 0) { - PyMem_Free(remain); + PyMem_FREE(remain); return -1; } for (j = 0; j < to_merge_size; j++) {