Changeset 159 for trunk

Timestamp:

Dec 3, 2006, 11:23:18 PM (19 years ago)

Author:

dmik

Message:

Kernel/QProcess:

• Fixed access violation (accessing a deleted instance) when QT_QPROCESS_DEBUG was defined.
• Fixed: if a program to execute was a shell script (started via '%COMSPEC% /c'), it was not separated by a space from its first argument (if any).

File:

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

trunk/src/kernel/qprocess_pm.cpp

@@ -544 +544 @@
             QProcess *proc = (QProcess *) PVOIDFROMMP( mp1 );
             USHORT key = SHORT1FROMMP( mp2 );
+            // check parameter validity (we can safely do it outside the lock
+            // because the GUI thread is the only that can modify pipeKeys)
+            if ( proc == pipeKeys.find( key ) ) {
 #if defined(QT_QPROCESS_DEBUG)
             qDebug( "QProcessMonitor::WM_U_PIPE_RDATA: proc=%p (%s/%s) d=%p "
@@ -549 +552 @@
                     proc, proc->name(), proc->className(), proc->d, key );
 #endif
-            // check parameter validity (we can safely do it outside the lock
-            // because the GUI thread is the only that can modify pipeKeys)
-            if ( proc == pipeKeys.find( key ) ) {
                 QProcessPrivate *d = proc->d;
                 if ( d->stdout.key == key ) {
@@ -560 +560 @@
                 }
             }
+#if defined(QT_QPROCESS_DEBUG)
+            else {
+                qDebug( "QProcessMonitor::WM_U_PIPE_RDATA: proc=%p (invalid)",
+                        proc );
+            }
+#endif                          
             break;
         }
@@ -565 +571 @@
             QProcess *proc = (QProcess *) PVOIDFROMMP( mp1 );
             USHORT key = SHORT1FROMMP( mp2 );
+            // check parameter validity (we can safely do it outside the lock
+            // because the GUI thread is the only that can modify pipeKeys)
+            if ( proc == pipeKeys.find( key ) ) {
 #if defined(QT_QPROCESS_DEBUG)
             qDebug( "QProcessMonitor::WM_U_PIPE_CLOSE: proc=%p (%s/%s) d=%p "
@@ -570 +579 @@
                     proc, proc->name(), proc->className(), proc->d, key );
 #endif
-            // check parameter validity (we can safely do it outside the lock
-            // because the GUI thread is the only that can modify pipeKeys)
-            if ( proc == pipeKeys.find( key ) ) {
                 QProcessPrivate *d = proc->d;
                 QProcessPrivate::Pipe *pipe = d->findPipe( key );
@@ -586 +592 @@
                 }
             }
+#if defined(QT_QPROCESS_DEBUG)
+            else {
+                qDebug( "QProcessMonitor::WM_U_PIPE_CLOSE: proc=%p (invalid)",
+                        proc );
+            }
+#endif                          
             break;
         }
@@ -686 +698 @@
     
 #if defined(QT_QPROCESS_DEBUG)
-    qDebug( "~QProcess::init(): d=%p", d );
+    qDebug( "QProcess::init(): d=%p", d );
 #endif
 }
@@ -954 +966 @@
              buf.resize( sz );
         strcpy( buf.data(), appNameFull );
-        sprintf( buf.data() + shellLen + 1, hasSpaces ? "/c \"%s\"" : "/c %s",
-                 appName.data() );
-        if ( appArgsLen )
-            strcat( buf.data() + shellLen + 1, appArgs.data() );
+        char *argsPtr = buf.data() + shellLen + 1;
+        sprintf( argsPtr, hasSpaces ? "/c \"%s\"" : "/c %s", appName.data() );
+        if ( appArgsLen ) {
+                        strcat( argsPtr, " " );
+            strcat( argsPtr, appArgs.data() );
+        }
         buf[ sz - 1 ] = '\0';
     }