Changeset 84873 in vbox for trunk

Timestamp:

Jun 18, 2020 3:37:09 PM (5 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Fixed leaving the process lock when the thread handle is not around anymore in VGSvcGstCtrlProcessWait(). bugref:9320

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp (modified) (1 diff)

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

@@ -253 +253 @@
 
     int rc = vgsvcGstCtrlProcessLock(pProcess);
-    if (   RT_SUCCESS(rc)
-        && pProcess->Thread != NIL_RTTHREAD) /* Is there a thread we can wait for? */
-    {
-        VGSvcVerbose(2, "[PID %RU32]: Waiting for shutdown (%RU32ms) ...\n", pProcess->uPID, msTimeout);
-
-        AssertMsgReturn(pProcess->fStarted,
-                        ("Tried to wait on guest process=%p (PID %RU32) which has not been started yet\n",
-                         pProcess, pProcess->uPID), VERR_INVALID_PARAMETER);
-
-        /* Unlock process before waiting. */
-        rc = vgsvcGstCtrlProcessUnlock(pProcess);
-        AssertRC(rc);
-
-        /* Do the actual waiting. */
-        int rcThread;
-        Assert(pProcess->Thread != NIL_RTTHREAD);
-        rc = RTThreadWait(pProcess->Thread, msTimeout, &rcThread);
-
-        int rc2 = vgsvcGstCtrlProcessLock(pProcess);
+    if (RT_SUCCESS(rc))
+    {
+        if (RTThreadGetState(pProcess->Thread) != RTTHREADSTATE_INVALID) /* Is there a thread we can wait for? */
+        {
+            VGSvcVerbose(2, "[PID %RU32]: Waiting for shutdown (%RU32ms) ...\n", pProcess->uPID, msTimeout);
+
+            AssertMsgReturn(pProcess->fStarted,
+                            ("Tried to wait on guest process=%p (PID %RU32) which has not been started yet\n",
+                             pProcess, pProcess->uPID), VERR_INVALID_PARAMETER);
+
+            /* Unlock process before waiting. */
+            rc = vgsvcGstCtrlProcessUnlock(pProcess);
+            AssertRC(rc);
+
+            /* Do the actual waiting. */
+            int rcThread;
+            Assert(pProcess->Thread != NIL_RTTHREAD);
+            rc = RTThreadWait(pProcess->Thread, msTimeout, &rcThread);
+
+            int rc2 = vgsvcGstCtrlProcessLock(pProcess);
+            AssertRC(rc2);
+
+            if (RT_SUCCESS(rc))
+            {
+                pProcess->Thread = NIL_RTTHREAD;
+                VGSvcVerbose(3, "[PID %RU32]: Thread shutdown complete, thread rc=%Rrc\n", pProcess->uPID, rcThread);
+                if (prc)
+                    *prc = rcThread;
+            }
+        }
+
+        int rc2 = vgsvcGstCtrlProcessUnlock(pProcess);
         AssertRC(rc2);
-
-        if (RT_SUCCESS(rc))
-        {
-            pProcess->Thread = NIL_RTTHREAD;
-            VGSvcVerbose(3, "[PID %RU32]: Thread shutdown complete, thread rc=%Rrc\n", pProcess->uPID, rcThread);
-            if (prc)
-                *prc = rcThread;
-        }
-        else
-            VGSvcError("[PID %RU32]: Waiting for shutting down thread returned error rc=%Rrc\n", pProcess->uPID, rc);
-
-        rc2 = vgsvcGstCtrlProcessUnlock(pProcess);
-        AssertRC(rc2);
-    }
+    }
+
+    if (RT_FAILURE(rc))
+        VGSvcError("[PID %RU32]: Waiting for shutting down thread returned error rc=%Rrc\n", pProcess->uPID, rc);
 
     VGSvcVerbose(3, "[PID %RU32]: Waiting resulted in rc=%Rrc\n", pProcess->uPID, rc);