Changeset 36749 in vbox

Timestamp:

Apr 20, 2011 11:50:36 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71283

Message:

VBoxService/GuestCtrl: Fixed getting output data from started process, added more checks.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControlExecThread.cpp (modified) (3 diffs)
• VBoxServicePipeBuf.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.cpp

@@ -304 +304 @@
             if (RT_SUCCESS(rc))
             {
-                uint32_t cbRead;
+                uint32_t cbRead = cbSize;
                 rc = VBoxServicePipeBufRead(pPipeBuf, pBuf, cbSize, &cbRead);
                 if (RT_SUCCESS(rc))
@@ -315 +315 @@
         else
             rc = VERR_NOT_FOUND; /* PID not found! */
-        RTCritSectLeave(&g_GuestControlExecThreadsCritSect);
+
+        int rc2 = RTCritSectLeave(&g_GuestControlExecThreadsCritSect);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
     }
     return rc;
@@ -374 +377 @@
         }
 
-        rc = RTCritSectLeave(&g_GuestControlExecThreadsCritSect);
-        AssertRC(rc);
+        int rc2 = RTCritSectLeave(&g_GuestControlExecThreadsCritSect);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
     }
     RTCritSectDelete(&g_GuestControlExecThreadsCritSect);

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp

@@ -64 +64 @@
             {
                 RTCritSectDelete(&pBuf->CritSect);
-                RTSemEventDestroy(pBuf->hEventSem);
+                if (pBuf->hEventSem != NIL_RTSEMEVENT)
+                    RTSemEventDestroy(pBuf->hEventSem);
             }
         }
@@ -89 +90 @@
     AssertReturn(cbBuffer, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pcbToRead, VERR_INVALID_POINTER);
+    AssertReturn(*pcbToRead > 0, VERR_INVALID_PARAMETER); /* Nothing to read makes no sense ... */
 
     int rc = RTCritSectEnter(&pBuf->CritSect);
@@ -105 +107 @@
             pBuf->cbOffset += *pcbToRead;
 
-            rc = RTSemEventSignal(pBuf->hEventSem);
-            AssertRC(rc);
+            if (pBuf->hEventSem != NIL_RTSEMEVENT)
+            {
+                rc = RTSemEventSignal(pBuf->hEventSem);
+                AssertRC(rc);
+            }
         }
         else
@@ -113 +118 @@
             *pcbToRead = 0;
         }
-        rc = RTCritSectLeave(&pBuf->CritSect);
+
+        int rc2 = RTCritSectLeave(&pBuf->CritSect);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
     }
     return rc;
@@ -256 +264 @@
                     *pcbWritten = cbData;
 
-                RTSemEventSignal(pBuf->hEventSem);
+                if (pBuf->hEventSem != NIL_RTSEMEVENT)
+                {
+                    rc = RTSemEventSignal(pBuf->hEventSem);
+                    AssertRC(rc);
+                }
             }
         }
@@ -275 +287 @@
     AssertPtrReturn(pBuf, VERR_INVALID_POINTER);
     AssertPtrReturn(pcbWritten, VERR_INVALID_POINTER);
+    AssertPtrReturn(pcbLeft, VERR_INVALID_POINTER);
 
     int rc = RTCritSectEnter(&pBuf->CritSect);