(original) (raw)

changeset: 84575:affb87b1d7ec user: Victor Stinner victor.stinner@gmail.com date: Fri Jul 12 00:42:14 2013 +0200 files: Objects/typeobject.c description: 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 -r 2f7c4df5cc46 -r affb87b1d7ec Objects/typeobject.c --- a/Objects/typeobject.c Fri Jul 12 00:37:30 2013 +0200 +++ b/Objects/typeobject.c Fri Jul 12 00:42:14 2013 +0200 @@ -1456,8 +1456,10 @@ 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 @@ } ok = PyList_Append(acc, candidate); if (ok < 0) { - PyMem_Free(remain); + PyMem_FREE(remain); return -1; } for (j = 0; j < to_merge_size; j++) { /victor.stinner@gmail.com