[3.13] gh-112729: Correctly fail when the process is out of memory during interpreter creation (GH-139164) (GH-139169)

* gh-112729: Correctly fail when the process is out of memory during interpreter creation (GH-139164)

(cherry picked from commit d06113c7a7)
This commit is contained in:
Peter Bierma 2025-09-19 11:09:44 -04:00 committed by GitHub
parent 9809c30456
commit 63dd27da3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 9 deletions

View file

@ -2301,17 +2301,16 @@ new_interpreter(PyThreadState **tstate_p,
interpreters: disable PyGILState_Check(). */
runtime->gilstate.check_enabled = 0;
PyInterpreterState *interp = PyInterpreterState_New();
if (interp == NULL) {
*tstate_p = NULL;
return _PyStatus_OK();
}
_PyInterpreterState_SetWhence(interp, whence);
interp->_ready = 1;
// XXX Might new_interpreter() have been called without the GIL held?
PyThreadState *save_tstate = _PyThreadState_GET();
PyThreadState *tstate = NULL;
PyInterpreterState *interp;
status = _PyInterpreterState_New(save_tstate, &interp);
if (interp == NULL) {
goto error;
}
_PyInterpreterState_SetWhence(interp, whence);
interp->_ready = 1;
/* From this point until the init_interp_create_gil() call,
we must not do anything that requires that the GIL be held
@ -2388,7 +2387,7 @@ new_interpreter(PyThreadState **tstate_p,
*tstate_p = NULL;
if (tstate != NULL) {
Py_EndInterpreter(tstate);
} else {
} else if (interp != NULL) {
PyInterpreterState_Delete(interp);
}
if (save_tstate != NULL) {