From f0857fcbd32632731a1a7430463a897befc9844e Mon Sep 17 00:00:00 2001
From: Ken Martin <ken.martin@kitware.com>
Date: Wed, 28 Mar 2007 11:06:34 -0400
Subject: [PATCH] BUG: even safer checking of return value

---
 Source/CTest/cmCTestBuildHandler.cxx | 49 +++++++++++++++-------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 8f32ccd14..52945bbd0 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -692,30 +692,35 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
 
   if(result == cmsysProcess_State_Exited)
     {
-    *retVal = cmsysProcess_GetExitValue(cp);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Command exited with the value: " << *retVal << std::endl);
-    // if a non zero return value
-    if (retVal && *retVal)
+    if (retVal)
       {
-      // If there was an error running command, report that on the dashboard.
-      cmCTestBuildErrorWarning errorwarning;
-      errorwarning.LogLine     = 1;
-      errorwarning.Text 
-        = "*** WARNING non-zero return value in ctest from: ";
-      errorwarning.Text        += argv[0];
-      errorwarning.PreContext  = "";
-      errorwarning.PostContext = "";
-      errorwarning.Error       = false;
-      this->ErrorsAndWarnings.push_back(errorwarning);
-      this->TotalWarnings ++;
+      *retVal = cmsysProcess_GetExitValue(cp);
+      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Command exited with the value: " << *retVal << std::endl);
+      // if a non zero return value
+      if (*retVal)
+        {
+        // If there was an error running command, report that on the dashboard.
+        cmCTestBuildErrorWarning errorwarning;
+        errorwarning.LogLine     = 1;
+        errorwarning.Text 
+          = "*** WARNING non-zero return value in ctest from: ";
+        errorwarning.Text        += argv[0];
+        errorwarning.PreContext  = "";
+        errorwarning.PostContext = "";
+        errorwarning.Error       = false;
+        this->ErrorsAndWarnings.push_back(errorwarning);
+        this->TotalWarnings ++;
+        }
       }
-    }
-  else if(result == cmsysProcess_State_Exception)
-    {
-    *retVal = cmsysProcess_GetExitException(cp);
-    cmCTestLog(this->CTest, WARNING, "There was an exception: " << *retVal
-      << std::endl);
+    else if(result == cmsysProcess_State_Exception)
+      {
+      if (retVal)
+        {
+        *retVal = cmsysProcess_GetExitException(cp);
+        cmCTestLog(this->CTest, WARNING, "There was an exception: " << *retVal
+                   << std::endl);
+        }
     }
   else if(result == cmsysProcess_State_Expired)
     {