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

vstinner · web-flow · commit fd23cfa464ab · 2019-03-20T00:03:01.000+01:00
Calling _PyRuntime_Initialize() after _PyRuntime_Finalize() now re-initializes
_PyRuntime structure. Previously, _PyRuntime_Initialize() did
nothing in that case.
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ static void call_ll_exitfuncs(void);`
`69`	`69`
`70`	`70`	`int _Py_UnhandledKeyboardInterrupt = 0;`
`71`	`71`	`_PyRuntimeState _PyRuntime = _PyRuntimeState_INIT;`
	`72`	`+static int runtime_initialized = 0;`
`72`	`73`
`73`	`74`	`_PyInitError`
`74`	`75`	`_PyRuntime_Initialize(void)`
`@@ -79,11 +80,10 @@ _PyRuntime_Initialize(void)`
`79`	`80`	`every Py_Initialize() call, but doing so breaks the runtime.`
`80`	`81`	`This is because the runtime state is not properly finalized`
`81`	`82`	`currently. */`
`82`		`- static int initialized = 0;`
`83`		`- if (initialized) {`
	`83`	`+ if (runtime_initialized) {`
`84`	`84`	`return _Py_INIT_OK();`
`85`	`85`	`}`
`86`		`- initialized = 1;`
	`86`	`+ runtime_initialized = 1;`
`87`	`87`
`88`	`88`	`return _PyRuntimeState_Init(&_PyRuntime);`
`89`	`89`	`}`
`@@ -92,6 +92,7 @@ void`
`92`	`92`	`_PyRuntime_Finalize(void)`
`93`	`93`	`{`
`94`	`94`	`_PyRuntimeState_Fini(&_PyRuntime);`
	`95`	`+ runtime_initialized = 0;`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`int`