Changeset 186 for trunk

Timestamp:

Nov 9, 2008, 9:45:46 PM (17 years ago)

Author:

dmik

Message:

Kernel: QPrcess: Make sure the pipe key is not used after the assoiated pipe is closed (ticket:51).

File:

• trunk/src/kernel/qprocess_pm.cpp (modified) (4 diffs)

trunk/src/kernel/qprocess_pm.cpp

@@ -193 +193 @@
     void closeHandles()
     {
-        if( pipeStdin != HP_NULL ) {
+        if( pipeStdin != HP_NULL ) {
             DosDisConnectNPipe( pipeStdin );
             DosClose( pipeStdin );
             pipeStdin = HP_NULL;
-        }
+        }
         closePipe( &stdout );
         closePipe( &stderr );
@@ -586 +586 @@
             if ( proc == pipeKeys.find( key ) ) {
 #if defined(QT_QPROCESS_DEBUG)
-            qDebug( "QProcessMonitor::WM_U_PIPE_CLOSE: proc=%p (%s/%s) d=%p "
-                    "key=%04hX",
-                    proc, proc->name(), proc->className(), proc->d, key );
+                qDebug( "QProcessMonitor::WM_U_PIPE_CLOSE: proc=%p (%s/%s) d=%p "
+                        "key=%04hX",
+                        proc, proc->name(), proc->className(), proc->d, key );
 #endif
                 QProcessPrivate *d = proc->d;
@@ -645 +645 @@
     // 1. If procesMonitor is NULL, it which means we're somewhere inside
     //    the QApplication destruction procedure.
-    // 2. If pipe->key us KEY_NULL, it means GUI thread has already processed
+    // 2. If pipe->key is KEY_NULL, it means GUI thread has already processed
     //    the WM_U_PIPE_CLOSE message and we're free to access fields w/o a
     //    lock. pipe->key is assigned only on the GUI thread, so it's safe
@@ -686 +686 @@
         // the client's end of pipe has been closed, so close our end as well
         if ( processMonitor && pipe->key != KEY_NULL ) {
-            // WM_U_PIPE_CLOSE has been posted but not yet processed
-            processMonitor->removeProcess( this, pipe );
-        }
-        closePipe( pipe );
+            // WM_U_PIPE_CLOSE has been posted but not yet processed: do
+            // nothing in this case and let it do the close job. This is vital
+            // since if we close the pipe now then it's possible that another
+            // QProcess instance created in the meantime will get a pipe with
+            // the same handle from the system (and therefore with the same key)
+            // so our pending WM_U_PIPE_CLOSE message will attempt to close an
+            // invalid (foreign) pipe
+        }
+        else 
+            closePipe( pipe );
     }