From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 9 Mar 2015 17:05:50 +0000 (-0700)
Subject: Issue #23619: Ensure C variable is initialized before using it.
X-Git-Tag: v3.5.0a3~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8011382285fe23ff0fc549f4c33cbc346c3a0dd0;p=python

Issue #23619: Ensure C variable is initialized before using it.
The garbage in _crtInstalledToken was causing the IsCrtInstalled() function to return TRUE without actually checking anything. We now initialize the variable first.
---

diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
index d090443cf6..547c9b8822 100644
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -2574,6 +2574,7 @@ public:
             }
         }
 
+        _crtInstalledToken = -1;
         pEngine->SetVariableNumeric(L"CRTInstalled", IsCrtInstalled() ? 1 : 0);
 
         _wixLoc = nullptr;
@@ -2603,8 +2604,6 @@ public:
         _suppressRepair = FALSE;
         _modifying = FALSE;
 
-        _crtInstalledToken = -1;
-
         _overridableVariables = nullptr;
         _taskbarList = nullptr;
         _taskbarButtonCreatedMessage = UINT_MAX;