From fc96437db4fa95dff99d43d4500beaf12bad5bff Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 1 Aug 2018 16:16:46 +0200 Subject: [PATCH] bpo-33499: Fix pymain_init_pycache_prefix() (GH-8596) Fix a memory leak in pymain_init_pycache_prefix() when PYTHONPYCACHEPREFIX and -X pycache_prefix are used. --- Modules/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Modules/main.c b/Modules/main.c index 664a70ad5eb..34069e1b2d3 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -1768,16 +1768,6 @@ pymain_init_tracemalloc(_PyCoreConfig *config) static _PyInitError pymain_init_pycache_prefix(_PyCoreConfig *config) { - wchar_t *env; - - int res = config_get_env_var_dup(config, &env, - L"PYTHONPYCACHEPREFIX", "PYTHONPYCACHEPREFIX"); - if (res < 0) { - return DECODE_LOCALE_ERR("PYTHONPYCACHEPREFIX", res); - } else if (env) { - config->pycache_prefix = env; - } - const wchar_t *xoption = config_get_xoption(config, L"pycache_prefix"); if (xoption) { const wchar_t *sep = wcschr(xoption, L'='); @@ -1790,6 +1780,16 @@ pymain_init_pycache_prefix(_PyCoreConfig *config) // -X pycache_prefix= can cancel the env var config->pycache_prefix = NULL; } + return _Py_INIT_OK(); + } + + wchar_t *env; + int res = config_get_env_var_dup(config, &env, + L"PYTHONPYCACHEPREFIX", "PYTHONPYCACHEPREFIX"); + if (res < 0) { + return DECODE_LOCALE_ERR("PYTHONPYCACHEPREFIX", res); + } else if (env) { + config->pycache_prefix = env; } return _Py_INIT_OK();