bpo-37369: Fixes crash when reporting fatal error (GH-14468)

zooba · web-flow · commit ac14632c756f · 2019-06-29T14:28:43.000-07:00
diff --git a/PC/python_uwp.cpp b/PC/python_uwp.cpp
@@ -166,12 +166,12 @@ wmain(int argc, wchar_t **argv)
     PyPreConfig_InitPythonConfig(&preconfig);
     status = Py_PreInitializeFromArgs(&preconfig, argc, argv);
     if (PyStatus_Exception(status)) {
-        goto fail;
+        goto fail_without_config;
     }
 
     status = PyConfig_InitPythonConfig(&config);
     if (PyStatus_Exception(status)) {
-        goto fail;
+        goto fail_without_config;
     }
 
     status = PyConfig_SetArgv(&config, argc, argv);
@@ -233,6 +233,7 @@ wmain(int argc, wchar_t **argv)
 
 fail:
     PyConfig_Clear(&config);
+fail_without_config:
     if (PyStatus_IsExit(status)) {
         return status.exitcode;
     }

Original file line number	Diff line number	Diff line change
`@@ -166,12 +166,12 @@ wmain(int argc, wchar_t **argv)`
`166`	`166`	`PyPreConfig_InitPythonConfig(&preconfig);`
`167`	`167`	`status = Py_PreInitializeFromArgs(&preconfig, argc, argv);`
`168`	`168`	`if (PyStatus_Exception(status)) {`
`169`		`- goto fail;`
	`169`	`+ goto fail_without_config;`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`status = PyConfig_InitPythonConfig(&config);`
`173`	`173`	`if (PyStatus_Exception(status)) {`
`174`		`- goto fail;`
	`174`	`+ goto fail_without_config;`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`status = PyConfig_SetArgv(&config, argc, argv);`
`@@ -233,6 +233,7 @@ wmain(int argc, wchar_t **argv)`
`233`	`233`
`234`	`234`	`fail:`
`235`	`235`	`PyConfig_Clear(&config);`
	`236`	`+fail_without_config:`
`236`	`237`	`if (PyStatus_IsExit(status)) {`
`237`	`238`	`return status.exitcode;`
`238`	`239`	`}`