Browse Source

Merge topic 'fix-uninitialized-21166'

c27553afb2 cmCTestBuildHandler: Avoid uninitialized line-numbers
e4e85c5b2d cmake: Fix uninitialized member in HandleDeleteCacheVariables

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5321
Brad King 5 years ago
parent
commit
e0045916c2
2 changed files with 4 additions and 0 deletions
  1. 2 0
      Source/CTest/cmCTestBuildHandler.cxx
  2. 2 0
      Source/cmake.cxx

+ 2 - 0
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));

+ 2 - 0
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));
   }