[Cmake-commits] [cmake-commits] hoffman committed cmWin32ProcessExecution.cxx 1.32 1.33

[cmake-commits at cmake.org]

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

Modified Files:
	cmWin32ProcessExecution.cxx 
Log Message:
BUG: fix extra close that killed cmake when being debugged 


Index: cmWin32ProcessExecution.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmWin32ProcessExecution.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -C 2 -d -r1.32 -r1.33
*** cmWin32ProcessExecution.cxx	27 Sep 2007 18:16:20 -0000	1.32
--- cmWin32ProcessExecution.cxx	4 Sep 2008 21:02:25 -0000	1.33
***************
*** 716,731 ****
--- 716,737 ----
    if(this->pStdErr != -1 )
      {
+     // this will close this as well: this->hChildStderrRdDup
      _close(this->pStdErr);
      this->pStdErr = -1;
+     this->hChildStderrRdDup = 0;
      }
    if(this->pStdIn != -1 )
      {
+     // this will close this as well: this->hChildStdinWrDup
      _close(this->pStdIn);
      this->pStdIn = -1;
+     this->hChildStdinWrDup = 0;
      }
    if(this->pStdOut != -1 )
      {
+     // this will close this as well: this->hChildStdoutRdDup
      _close(this->pStdOut);
      this->pStdOut = -1;
+     this->hChildStdoutRdDup = 0;
      }
  
***************
*** 736,754 ****
      }
    this->hChildStdinRd = 0;
!   if(this->hChildStdoutRdDup && !CloseHandle(this->hChildStdoutRdDup))
!     {
!     ret = false;
!     }
!   this->hChildStdoutRdDup = 0;
!   if(this->hChildStderrRdDup && !CloseHandle(this->hChildStderrRdDup))
!     {
!     ret = false;
!     }
!   this->hChildStderrRdDup = 0;
!   if(this->hChildStdinWrDup && !CloseHandle(this->hChildStdinWrDup))
!     {
!     ret = false;
!     }
!   this->hChildStdinWrDup = 0;
    if (this->hChildStdoutWr && !CloseHandle(this->hChildStdoutWr))
      {
--- 742,746 ----
      }
    this->hChildStdinRd = 0;
!   // now close these two
    if (this->hChildStdoutWr && !CloseHandle(this->hChildStdoutWr))
      {