diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-03-09 17:05:50 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-03-09 17:05:50 (GMT) |
| commit | 8011382285fe23ff0fc549f4c33cbc346c3a0dd0 (patch) | |
| tree | 390ad6bfe4bbe002e04c80dfb049eabc448edc1b /Tools/msi/bundle/bootstrap | |
| parent | 5d2d63ed7dab4487e2f0f0d0f3d2cf5b185b5082 (diff) | |
| download | cpython-8011382285fe23ff0fc549f4c33cbc346c3a0dd0.zip cpython-8011382285fe23ff0fc549f4c33cbc346c3a0dd0.tar.gz cpython-8011382285fe23ff0fc549f4c33cbc346c3a0dd0.tar.bz2 | |
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.
Diffstat (limited to 'Tools/msi/bundle/bootstrap')
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index d090443..547c9b8 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; |