Backport: Add more missing PyErr_NoMemory() after failled memory allocs

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index ba0a383170f13e8de4ff53fe46df7057f14c7e69..48097171efe6889212c10f42857597330828194e 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1346,7 +1346,7 @@ Tkapp_CreateCommand(PyObject *self, PyObject *args)
 
        data = PyMem_NEW(PythonCmd_ClientData, 1);
        if (!data)
-               return NULL;
+               return PyErr_NoMemory();
        Py_XINCREF(self);
        Py_XINCREF(func);
        data->self = self;

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 59c3efd150228d543b9800d9ae3d561d2618b742..f41d42dc8e474fed9568ac389a62292252de4e77 100644 (file)
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1510,7 +1510,7 @@ posix_execv(PyObject *self, PyObject *args)
 
        argvlist = PyMem_NEW(char *, argc+1);
        if (argvlist == NULL)
-               return NULL;
+               return PyErr_NoMemory();
        for (i = 0; i < argc; i++) {
                if (!PyArg_Parse((*getitem)(argv, i), "s", &argvlist[i])) {
                        PyMem_DEL(argvlist);
@@ -1706,7 +1706,7 @@ posix_spawnv(PyObject *self, PyObject *args)
 
        argvlist = PyMem_NEW(char *, argc+1);
        if (argvlist == NULL)
-               return NULL;
+               return PyErr_NoMemory();
        for (i = 0; i < argc; i++) {
                if (!PyArg_Parse((*getitem)(argv, i), "s", &argvlist[i])) {
                        PyMem_DEL(argvlist);

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 18ab1459056abce600faf904368ce4db2b0ab346..1249e0b29c3cf0ff0b744f2bd0440368abf1d688 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -5876,7 +5876,7 @@ unicode_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        if (pnew->str == NULL) {
                _Py_ForgetReference((PyObject *)pnew);
                PyObject_DEL(pnew);
-               return NULL;
+               return PyErr_NoMemory();
        }
        Py_UNICODE_COPY(pnew->str, tmp->str, n+1);
        pnew->length = n;