[Cmake-commits] [cmake-commits] hoffman committed cmCTestBuildAndTestHandler.cxx 1.24 1.25

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv8489

Modified Files:
	cmCTestBuildAndTestHandler.cxx 
Log Message:
BUG: fix crash when running ctest coverage for VTK


Index: cmCTestBuildAndTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildAndTestHandler.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** cmCTestBuildAndTestHandler.cxx	18 Dec 2008 17:27:59 -0000	1.24
--- cmCTestBuildAndTestHandler.cxx	15 Jun 2009 17:51:07 -0000	1.25
***************
*** 160,163 ****
--- 160,171 ----
    out->append(m, len);
  }
+ struct cmSetupOutputCaptureCleanup
+ {
+   ~cmSetupOutputCaptureCleanup()
+   {
+     cmSystemTools::SetErrorCallback(0, 0);
+     cmSystemTools::SetStdoutCallback(0, 0);
+   }
+ };
  
  //----------------------------------------------------------------------
***************
*** 168,171 ****
--- 176,183 ----
    cmSystemTools::SetErrorCallback(CMakeMessageCallback, &cmakeOutString);
    cmSystemTools::SetStdoutCallback(CMakeStdoutCallback, &cmakeOutString);
+   // make sure SetStdoutCallback and SetErrorCallback are set to null
+   // after this function exits so that they do not point at a destroyed
+   // string cmakeOutString
+   cmSetupOutputCaptureCleanup cleanup;
    cmOStringStream out;