From: Victor Stinner <vstinner@redhat.com>
Date: Wed, 1 Aug 2018 14:16:46 +0000 (+0200)
Subject: bpo-33499: Fix pymain_init_pycache_prefix() (GH-8596)
X-Git-Tag: v3.8.0a1~1264
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc96437db4fa95dff99d43d4500beaf12bad5bff;p=python

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.
---

diff --git a/Modules/main.c b/Modules/main.c
index 664a70ad5e..34069e1b2d 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();