bpo-36356: pymain_free() calls _PyRuntime_Finalize() (GH-12435)

vstinner · web-flow · commit f5f336a819a3 · 2019-03-19T14:53:58.000+01:00
Ensure that _PyRuntime_Finalize() is always call. This change fix a
few memory leaks when running "python3 -V".
diff --git a/Include/internal/pycore_pystate.h b/Include/internal/pycore_pystate.h
@@ -184,6 +184,8 @@ PyAPI_FUNC(void) _PyRuntimeState_ReInitThreads(void);
    Return NULL on success, or return an error message on failure. */
 PyAPI_FUNC(_PyInitError) _PyRuntime_Initialize(void);
 
+PyAPI_FUNC(void) _PyRuntime_Finalize(void);
+
 #define _Py_CURRENTLY_FINALIZING(tstate) \
     (_PyRuntime.finalizing == tstate)
 
diff --git a/Modules/main.c b/Modules/main.c
@@ -839,6 +839,7 @@ pymain_free(void)
     _PyPathConfig_ClearGlobal();
     _Py_ClearStandardStreamEncoding();
     _Py_ClearArgcArgv();
+    _PyRuntime_Finalize();
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -839,6 +839,7 @@ pymain_free(void)`
`839`	`839`	`_PyPathConfig_ClearGlobal();`
`840`	`840`	`_Py_ClearStandardStreamEncoding();`
`841`	`841`	`_Py_ClearArgcArgv();`
	`842`	`+ _PyRuntime_Finalize();`
`842`	`843`	`}`
`843`	`844`
`844`	`845`