bpo-36301: Fix Py_Main() memory leaks (pythonGH-12420)

vstinner · matrixise · web-flow · commit c183444f7e26 · 2019-03-18T22:24:28.000+01:00
bpo-36301, bpo-36333:

* Fix memory allocator used by _PyPathConfig_ClearGlobal():
  force the default allocator.
* _PyPreConfig_ReadFromArgv(): free init_ctype_locale memory.
* pymain_main(): call pymain_free() on init error

Co-Authored-By: Stéphane Wirtel &lt;stephane@wirtel.be&gt;
diff --git a/Modules/main.c b/Modules/main.c
@@ -888,13 +888,13 @@ pymain_main(_PyArgv *args)
     PyInterpreterState *interp;
     err = pymain_init(args, &interp);
     if (_Py_INIT_FAILED(err)) {
-        _Py_ExitInitError(err);
+        goto exit_init_error;
     }
 
     int exitcode = 0;
     err = pymain_run_python(interp, &exitcode);
     if (_Py_INIT_FAILED(err)) {
-        _Py_ExitInitError(err);
+        goto exit_init_error;
     }
 
     if (Py_FinalizeEx() < 0) {
@@ -910,6 +910,10 @@ pymain_main(_PyArgv *args)
     }
 
     return exitcode;
+
+exit_init_error:
+    pymain_free();
+    _Py_ExitInitError(err);
 }
 
 
diff --git a/Python/pathconfig.c b/Python/pathconfig.c
@@ -149,7 +149,12 @@ _PyPathConfig_SetGlobal(const _PyPathConfig *config)
 void
 _PyPathConfig_ClearGlobal(void)
 {
+    PyMemAllocatorEx old_alloc;
+    _PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
+
     _PyPathConfig_Clear(&_Py_path_config);
+
+    PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
 }
 
 
diff --git a/Python/preconfig.c b/Python/preconfig.c
@@ -758,6 +758,7 @@ _PyPreConfig_ReadFromArgv(_PyPreConfig *config, const _PyArgv *args)
 done:
     if (init_ctype_locale != NULL) {
         setlocale(LC_CTYPE, init_ctype_locale);
+        PyMem_RawFree(init_ctype_locale);
     }
     _PyPreConfig_Clear(&save_config);
     Py_UTF8Mode = init_utf8_mode ;

Original file line number	Diff line number	Diff line change
`@@ -888,13 +888,13 @@ pymain_main(_PyArgv *args)`
`888`	`888`	`PyInterpreterState *interp;`
`889`	`889`	`err = pymain_init(args, &interp);`
`890`	`890`	`if (_Py_INIT_FAILED(err)) {`
`891`		`- _Py_ExitInitError(err);`
	`891`	`+ goto exit_init_error;`
`892`	`892`	`}`
`893`	`893`
`894`	`894`	`int exitcode = 0;`
`895`	`895`	`err = pymain_run_python(interp, &exitcode);`
`896`	`896`	`if (_Py_INIT_FAILED(err)) {`
`897`		`- _Py_ExitInitError(err);`
	`897`	`+ goto exit_init_error;`
`898`	`898`	`}`
`899`	`899`
`900`	`900`	`if (Py_FinalizeEx() < 0) {`
`@@ -910,6 +910,10 @@ pymain_main(_PyArgv *args)`
`910`	`910`	`}`
`911`	`911`
`912`	`912`	`return exitcode;`
	`913`	`+`
	`914`	`+exit_init_error:`
	`915`	`+ pymain_free();`
	`916`	`+ _Py_ExitInitError(err);`
`913`	`917`	`}`
`914`	`918`
`915`	`919`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,12 @@ _PyPathConfig_SetGlobal(const _PyPathConfig *config)`
`149`	`149`	`void`
`150`	`150`	`_PyPathConfig_ClearGlobal(void)`
`151`	`151`	`{`
	`152`	`+ PyMemAllocatorEx old_alloc;`
	`153`	`+ _PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc);`
	`154`	`+`
`152`	`155`	`_PyPathConfig_Clear(&_Py_path_config);`
	`156`	`+`
	`157`	`+ PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);`
`153`	`158`	`}`
`154`	`159`
`155`	`160`
Original file line number	Diff line number	Diff line change
`@@ -758,6 +758,7 @@ _PyPreConfig_ReadFromArgv(_PyPreConfig config, const _PyArgv args)`
`758`	`758`	`done:`
`759`	`759`	`if (init_ctype_locale != NULL) {`
`760`	`760`	`setlocale(LC_CTYPE, init_ctype_locale);`
	`761`	`+ PyMem_RawFree(init_ctype_locale);`
`761`	`762`	`}`
`762`	`763`	`_PyPreConfig_Clear(&save_config);`
`763`	`764`	`Py_UTF8Mode = init_utf8_mode ;`