bpo-32030: Add _PyImport_Fini2() (#4737)

PyImport_ExtendInittab() now uses PyMem_RawRealloc() rather than
PyMem_Realloc(). PyImport_ExtendInittab() can be called before
Py_Initialize() whereas only the PyMem_Raw allocator is supposed to
be used before Py_Initialize().

Add _PyImport_Fini2() to release the memory allocated by
PyImport_ExtendInittab() at exit. PyImport_ExtendInittab() now forces
the usage of the default raw allocator, to be able to release memory
in _PyImport_Fini2().

Don't export these functions anymore to be C API, only to
Py_BUILD_CORE:

* _PyExc_Fini()
* _PyImport_Fini()
* _PyGC_DumpShutdownStats()
* _PyGC_Fini()
* _PyType_Fini()
* _Py_HashRandomization_Fini()

1 files changed, 26 insertions, 18 deletions

diff --git a/Modules/main.c b/Modules/main.c
index 6d53c56..4ab1ff2 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -446,17 +446,18 @@ pymain_optlist_clear(_Py_OptList *list)
     list->options = NULL;
 }
 
-static void
-pymain_free_impl(_PyMain *pymain)
-{
-    _Py_CommandLineDetails *cmdline = &pymain->cmdline;
-    pymain_optlist_clear(&cmdline->warning_options);
-    pymain_optlist_clear(&cmdline->xoptions);
-    PyMem_RawFree(cmdline->command);
 
-    pymain_optlist_clear(&pymain->env_warning_options);
-    Py_CLEAR(pymain->main_importer_path);
+/* Free global variables which cannot be freed in Py_Finalize():
+   configuration options set before Py_Initialize() which should
+   remain valid after Py_Finalize(), since Py_Initialize()/Py_Finalize() can
+   be called multiple times.
 
+   Called with the current memory allocators. */
+static void
+pymain_free_globals(_PyMain *pymain)
+{
+    _PyPathConfig_Clear(&_Py_path_config);
+    _PyImport_Fini2();
     _PyMainInterpreterConfig_Clear(&pymain->config);
 
 #ifdef __INSURE__
@@ -473,6 +474,20 @@ pymain_free_impl(_PyMain *pymain)
 #endif /* __INSURE__ */
 }
 
+
+static void
+pymain_free_pymain(_PyMain *pymain)
+{
+    _Py_CommandLineDetails *cmdline = &pymain->cmdline;
+    pymain_optlist_clear(&cmdline->warning_options);
+    pymain_optlist_clear(&cmdline->xoptions);
+    PyMem_RawFree(cmdline->command);
+
+    pymain_optlist_clear(&pymain->env_warning_options);
+    Py_CLEAR(pymain->main_importer_path);
+
+}
+
 static void
 pymain_free(_PyMain *pymain)
 {
@@ -480,12 +495,12 @@ pymain_free(_PyMain *pymain)
     PyMemAllocatorEx old_alloc;
     _PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
 
-    pymain_free_impl(pymain);
+    pymain_free_pymain(pymain);
+    pymain_free_globals(pymain);
 
     PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
 }
 
-
 static int
 pymain_run_main_from_importer(_PyMain *pymain)
 {
@@ -1719,13 +1734,6 @@ pymain_impl(_PyMain *pymain)
         pymain->status = 120;
     }
 
-    /* _PyPathConfig_Clear() cannot be called in Py_FinalizeEx().
-       Py_Initialize() and Py_Finalize() can be called multiple times, but it
-       must not "forget" parameters set by Py_SetProgramName(), Py_SetPath() or
-       Py_SetPythonHome(), whereas _PyPathConfig_Clear() clear all these
-       parameters. */
-    _PyPathConfig_Clear(&_Py_path_config);
-
     return 0;
 }