Issue #7544: Preallocate thread memory before creating the thread to avoid a
fatal error in low memory condition.
diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
index b65360e..6494f49 100644
--- a/Modules/threadmodule.c
+++ b/Modules/threadmodule.c
@@ -428,6 +428,7 @@
PyObject *func;
PyObject *args;
PyObject *keyw;
+ PyThreadState *tstate;
};
static void
@@ -437,8 +438,9 @@
PyThreadState *tstate;
PyObject *res;
- tstate = PyThreadState_New(boot->interp);
-
+ tstate = boot->tstate;
+ tstate->thread_id = PyThread_get_thread_ident();
+ _PyThreadState_Init(tstate);
PyEval_AcquireThread(tstate);
nb_threads++;
res = PyEval_CallObjectWithKeywords(
@@ -503,6 +505,11 @@
boot->func = func;
boot->args = args;
boot->keyw = keyw;
+ boot->tstate = _PyThreadState_Prealloc(boot->interp);
+ if (boot->tstate == NULL) {
+ PyMem_DEL(boot);
+ return PyErr_NoMemory();
+ }
Py_INCREF(func);
Py_INCREF(args);
Py_XINCREF(keyw);
@@ -513,6 +520,7 @@
Py_DECREF(func);
Py_DECREF(args);
Py_XDECREF(keyw);
+ PyThreadState_Clear(boot->tstate);
PyMem_DEL(boot);
return NULL;
}