[Cmake-commits] [cmake-commits] king committed cmCTest.cxx 1.341 1.342

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTest.cxx 
Log Message:
BUG: Fix crash when running internal CTest

When CTest encounters a test whose executable is the ctest executable
iteslf, it just invokes code inside itself to avoid starting a new
process.  This fixes a null-pointer dereference in the logging code of
that case.


Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.341
retrieving revision 1.342
diff -C 2 -d -r1.341 -r1.342
*** cmCTest.cxx	26 Nov 2008 19:38:40 -0000	1.341
--- cmCTest.cxx	18 Dec 2008 17:27:54 -0000	1.342
***************
*** 1155,1159 ****
          }
        }
!     if ( *log )
        {
        *log << "* Run internal CTest" << std::endl;
--- 1155,1159 ----
          }
        }
!     if ( log )
        {
        *log << "* Run internal CTest" << std::endl;
***************
*** 1167,1171 ****
  
      *retVal = inst.Run(args, output);
!     if ( *log )
        {
        *log << output->c_str();
--- 1167,1171 ----
  
      *retVal = inst.Run(args, output);
!     if ( log )
        {
        *log << output->c_str();