diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-06 10:55:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-06 10:55:31 (GMT) |
| commit | e0045916c2bb0222549b6f26a5ce588ac642b56a (patch) | |
| tree | 791399125c1039a707110555ac4994dbd003b88b /Source | |
| parent | ad2ac18a2347e3d447ddf2591955efdd4984a35d (diff) | |
| parent | c27553afb2013d83b90a71ca7940643da01b20d4 (diff) | |
| download | CMake-e0045916c2bb0222549b6f26a5ce588ac642b56a.zip CMake-e0045916c2bb0222549b6f26a5ce588ac642b56a.tar.gz CMake-e0045916c2bb0222549b6f26a5ce588ac642b56a.tar.bz2 | |
Merge topic 'fix-uninitialized-21166'
c27553afb2 cmCTestBuildHandler: Avoid uninitialized line-numbers
e4e85c5b2d cmake: Fix uninitialized member in HandleDeleteCacheVariables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5321
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestBuildHandler.cxx | 2 | ||||
| -rw-r--r-- | Source/cmake.cxx | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index bb700eba..103dc1e 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -901,6 +901,7 @@ int cmCTestBuildHandler::RunMakeCommand(const std::string& command, reporter.WriteXML(); } else { cmCTestBuildErrorWarning errorwarning; + errorwarning.LineNumber = 0; errorwarning.LogLine = 1; errorwarning.Text = cmStrCat( "*** WARNING non-zero return value in ctest from: ", argv[0]); @@ -925,6 +926,7 @@ int cmCTestBuildHandler::RunMakeCommand(const std::string& command, } else if (result == cmsysProcess_State_Error) { // If there was an error running command, report that on the dashboard. cmCTestBuildErrorWarning errorwarning; + errorwarning.LineNumber = 0; errorwarning.LogLine = 1; errorwarning.Text = cmStrCat("*** ERROR executing: ", cmsysProcess_GetErrorString(cp)); diff --git a/Source/cmake.cxx b/Source/cmake.cxx index dc06fae..d9c6b7a 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1409,6 +1409,8 @@ int cmake::HandleDeleteCacheVariables(const std::string& var) this->State->GetCacheEntryProperty(save.key, "HELPSTRING")) { save.help = *help; } + } else { + save.type = cmStateEnums::CacheEntryType::UNINITIALIZED; } saved.push_back(std::move(save)); } |