(original) (raw)

changeset: 84643:c676fc74d779 user: Victor Stinner victor.stinner@gmail.com date: Mon Jul 15 19:34:20 2013 +0200 files: Objects/typeobject.c description: Issue #18408: type_new() and PyType_FromSpecWithBases() now raise MemoryError on memory allocation failure diff -r ef0dbe00760e -r c676fc74d779 Objects/typeobject.c --- a/Objects/typeobject.c Mon Jul 15 18:22:47 2013 +0200 +++ b/Objects/typeobject.c Mon Jul 15 19:34:20 2013 +0200 @@ -2292,8 +2292,10 @@ /* Silently truncate the docstring if it contains null bytes. */ len = strlen(doc_str); tp_doc = (char *)PyObject_MALLOC(len + 1); - if (tp_doc == NULL) + if (tp_doc == NULL) { + PyErr_NoMemory(); goto error; + } memcpy(tp_doc, doc_str, len + 1); type->tp_doc = tp_doc; } @@ -2496,8 +2498,10 @@ if (slot->slot == Py_tp_doc) { size_t len = strlen(slot->pfunc)+1; char *tp_doc = PyObject_MALLOC(len); - if (tp_doc == NULL) + if (tp_doc == NULL) { + PyErr_NoMemory(); goto fail; + } memcpy(tp_doc, slot->pfunc, len); type->tp_doc = tp_doc; } /victor.stinner@gmail.com