From: Steve Dower <steve.dower@python.org>
Date: Sat, 29 Jun 2019 21:28:43 +0000 (-0700)
Subject: bpo-37369: Fixes crash when reporting fatal error (GH-14468)
X-Git-Tag: v3.9.0a1~1136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac14632c756fec561e4b868b8793334bd7b22241;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/PC/python_uwp.cpp b/PC/python_uwp.cpp
index 73e0d82e5503..2352f45e8a3d 100644
--- 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;
     }