traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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 <stephane@wirtel.be>
This commit is contained in:
Victor Stinner 2019-03-18 22:24:28 +01:00 committed by GitHub
parent a10d426bab
commit c183444f7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/main.c
View File

@ -888,13 +888,13 @@ pymain_main(_PyArgv *args)
PyInterpreterState *interp; PyInterpreterState *interp;
err = pymain_init(args, &interp); err = pymain_init(args, &interp);
if (_Py_INIT_FAILED(err)) { if (_Py_INIT_FAILED(err)) {
_Py_ExitInitError(err); goto exit_init_error;
} }
int exitcode = 0; int exitcode = 0;
err = pymain_run_python(interp, &exitcode); err = pymain_run_python(interp, &exitcode);
if (_Py_INIT_FAILED(err)) { if (_Py_INIT_FAILED(err)) {
_Py_ExitInitError(err); goto exit_init_error;
} }
if (Py_FinalizeEx() < 0) { if (Py_FinalizeEx() < 0) {
@ -910,6 +910,10 @@ pymain_main(_PyArgv *args)
} }
return exitcode; return exitcode;
exit_init_error:
pymain_free();
_Py_ExitInitError(err);
} }

5
Python/pathconfig.c
View File

@ -149,7 +149,12 @@ done:
void void
_PyPathConfig_ClearGlobal(void) _PyPathConfig_ClearGlobal(void)
{ {
PyMemAllocatorEx old_alloc;
_PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
_PyPathConfig_Clear(&_Py_path_config); _PyPathConfig_Clear(&_Py_path_config);
PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
} }

1
Python/preconfig.c
View File

@ -758,6 +758,7 @@ _PyPreConfig_ReadFromArgv(_PyPreConfig *config, const _PyArgv *args)
done: done:
if (init_ctype_locale != NULL) { if (init_ctype_locale != NULL) {
setlocale(LC_CTYPE, init_ctype_locale); setlocale(LC_CTYPE, init_ctype_locale);
PyMem_RawFree(init_ctype_locale);
} }
_PyPreConfig_Clear(&save_config); _PyPreConfig_Clear(&save_config);
Py_UTF8Mode = init_utf8_mode ; Py_UTF8Mode = init_utf8_mode ;