bpo-36763: Use PyConfig_Clear() (GH-14445)

vstinner · web-flow · commit 67310023f299 · 2019-07-01T19:52:45.000+02:00
Stop using "static PyConfig", PyConfig must now always use
dynamically allocated strings: use PyConfig_SetString(),
PyConfig_SetArgv() and PyConfig_Clear().
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
@@ -695,10 +695,19 @@ def test_init_from_config(self):
 
             'pycache_prefix': 'conf_pycache_prefix',
             'program_name': './conf_program_name',
-            'argv': ['-c', 'arg2'],
+            'argv': ['-c', 'arg2', ],
             'parse_argv': 1,
-            'xoptions': ['xoption1=3', 'xoption2=', 'xoption3'],
-            'warnoptions': ['error::ResourceWarning', 'default::BytesWarning'],
+            'xoptions': [
+                'config_xoption1=3',
+                'config_xoption2=',
+                'config_xoption3',
+                'cmdline_xoption',
+            ],
+            'warnoptions': [
+                'config_warnoption',
+                'cmdline_warnoption',
+                'default::BytesWarning',
+            ],
             'run_command': 'pass\n',
 
             'site_import': 0,
diff --git a/Modules/main.c b/Modules/main.c
@@ -62,7 +62,7 @@ pymain_init(const _PyArgv *args)
     PyConfig config;
     status = PyConfig_InitPythonConfig(&config);
     if (_PyStatus_EXCEPTION(status)) {
-        return status;
+        goto done;
     }
 
     /* pass NULL as the config: config is read from command line arguments,
@@ -74,14 +74,18 @@ pymain_init(const _PyArgv *args)
         status = PyConfig_SetArgv(&config, args->argc, args->wchar_argv);
     }
     if (_PyStatus_EXCEPTION(status)) {
-        return status;
+        goto done;
     }
 
     status = Py_InitializeFromConfig(&config);
     if (_PyStatus_EXCEPTION(status)) {
-        return status;
+        goto done;
     }
-    return _PyStatus_OK();
+    status = _PyStatus_OK();
+
+done:
+    PyConfig_Clear(&config);
+    return status;
 }
 
 
diff --git a/Programs/_freeze_importlib.c b/Programs/_freeze_importlib.c
@@ -88,7 +88,7 @@ main(int argc, char *argv[])
     config.site_import = 0;
 
     status = PyConfig_SetString(&config, &config.program_name,
-                                  L"./_freeze_importlib");
+                                L"./_freeze_importlib");
     if (PyStatus_Exception(status)) {
         PyConfig_Clear(&config);
         Py_ExitStatusException(status);
diff --git a/Programs/_testembed.c b/Programs/_testembed.c

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ pymain_init(const _PyArgv *args)`
`62`	`62`	`PyConfig config;`
`63`	`63`	`status = PyConfig_InitPythonConfig(&config);`
`64`	`64`	`if (_PyStatus_EXCEPTION(status)) {`
`65`		`- return status;`
	`65`	`+ goto done;`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/* pass NULL as the config: config is read from command line arguments,`
`@@ -74,14 +74,18 @@ pymain_init(const _PyArgv *args)`
`74`	`74`	`status = PyConfig_SetArgv(&config, args->argc, args->wchar_argv);`
`75`	`75`	`}`
`76`	`76`	`if (_PyStatus_EXCEPTION(status)) {`
`77`		`- return status;`
	`77`	`+ goto done;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`status = Py_InitializeFromConfig(&config);`
`81`	`81`	`if (_PyStatus_EXCEPTION(status)) {`
`82`		`- return status;`
	`82`	`+ goto done;`
`83`	`83`	`}`
`84`		`- return _PyStatus_OK();`
	`84`	`+ status = _PyStatus_OK();`
	`85`	`+`
	`86`	`+done:`
	`87`	`+ PyConfig_Clear(&config);`
	`88`	`+ return status;`
`85`	`89`	`}`
`86`	`90`
`87`	`91`