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

vstinner · web-flow · commit 935250d6f3ac · 2019-03-19T15:08:17.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/pystate.h b/Include/internal/pystate.h
@@ -118,6 +118,9 @@ PyAPI_FUNC(void) _PyRuntimeState_Fini(_PyRuntimeState *);
    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
@@ -660,6 +660,8 @@ pymain_free_raw(_PyMain *pymain)
     orig_argc = 0;
     orig_argv = NULL;
 
+    _PyRuntime_Finalize();
+
     PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -660,6 +660,8 @@ pymain_free_raw(_PyMain *pymain)`
`660`	`660`	`orig_argc = 0;`
`661`	`661`	`orig_argv = NULL;`
`662`	`662`
	`663`	`+ _PyRuntime_Finalize();`
	`664`	`+`
`663`	`665`	`PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);`
`664`	`666`	`}`
`665`	`667`