traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-35388: Fix _PyRuntime_Finalize() (GH-12443) 

Calling _PyRuntime_Initialize() after _PyRuntime_Finalize() now re-initializes
_PyRuntime structure. Previously, _PyRuntime_Initialize() did
nothing in that case.
This commit is contained in:
Victor Stinner 2019-03-20 00:03:01 +01:00 committed by GitHub
parent fe13883f01
commit fd23cfa464
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Python/pylifecycle.c
View File

@ -69,6 +69,7 @@ static void call_ll_exitfuncs(void);
int _Py_UnhandledKeyboardInterrupt = 0;
_PyRuntimeState _PyRuntime = _PyRuntimeState_INIT;
static int runtime_initialized = 0;
_PyInitError
_PyRuntime_Initialize(void)
@ -79,11 +80,10 @@ _PyRuntime_Initialize(void)
every Py_Initialize() call, but doing so breaks the runtime.
This is because the runtime state is not properly finalized
currently. */
static int initialized = 0;
if (initialized) {
if (runtime_initialized) {
return _Py_INIT_OK();
}
initialized = 1;
runtime_initialized = 1;
return _PyRuntimeState_Init(&_PyRuntime);
}
@ -92,6 +92,7 @@ void
_PyRuntime_Finalize(void)
{
_PyRuntimeState_Fini(&_PyRuntime);
runtime_initialized = 0;
}
int