[Python-checkins] cpython: Issue #23619: Ensure C variable is initialized before using it.
steve.dower
python-checkins at python.org
Mon Mar 9 18:06:25 CET 2015
https://hg.python.org/cpython/rev/0469af231d22
changeset: 94920:0469af231d22
user: Steve Dower <steve.dower at microsoft.com>
date: Mon Mar 09 10:05:50 2015 -0700
summary:
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.
files:
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
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -2574,6 +2574,7 @@
}
}
+ _crtInstalledToken = -1;
pEngine->SetVariableNumeric(L"CRTInstalled", IsCrtInstalled() ? 1 : 0);
_wixLoc = nullptr;
@@ -2603,8 +2604,6 @@
_suppressRepair = FALSE;
_modifying = FALSE;
- _crtInstalledToken = -1;
-
_overridableVariables = nullptr;
_taskbarList = nullptr;
_taskbarButtonCreatedMessage = UINT_MAX;
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list