Changeset 22732 in vbox

Timestamp:

Sep 3, 2009 9:59:50 AM (15 years ago)

Author:

vboxsync

Message:

HGCM: properly delete a client handle on the client disconnect. Should fix HGCMReset hang.

File:

• trunk/src/VBox/Main/hgcm/HGCM.cpp (modified) (1 diff)

trunk/src/VBox/Main/hgcm/HGCM.cpp

@@ -1359 +1359 @@
             rc = hgcmMsgSend (hMsg);
         }
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        /* Remove the client id from the array in any case. */
-        int i;
-
-        for (i = 0; i < m_cClients; i++)
-        {
-            if (m_paClientIds[i] == u32ClientId)
-            {
-                m_cClients--;
-
-                if (m_cClients > i)
-                {
-                    memmove (&m_paClientIds[i], &m_paClientIds[i + 1], m_cClients - i);
-                }
-
-                break;
+        else
+        {
+            LogRel(("[%s] hgcmMsgAlloc(%p, SVC_MSG_DISCONNECT) failed %Rrc\n",
+                    RT_VALID_PTR(m_pszSvcName)? m_pszSvcName: "", m_thread, rc));
+        }
+    }
+
+    /* Remove the client id from the array in any case, rc does not matter. */
+    int i;
+
+    for (i = 0; i < m_cClients; i++)
+    {
+        if (m_paClientIds[i] == u32ClientId)
+        {
+            m_cClients--;
+
+            if (m_cClients > i)
+            {
+                memmove (&m_paClientIds[i], &m_paClientIds[i + 1], m_cClients - i);
             }
-        }
-
-        /* Delete the client handle. */
-        hgcmObjDeleteHandle (u32ClientId);
-
-        /* The service must be released. */
-        ReleaseService ();
-    }
+
+            break;
+        }
+    }
+
+    /* Delete the client handle. */
+    hgcmObjDeleteHandle (u32ClientId);
+
+    /* The service must be released. */
+    ReleaseService ();
 
     LogFlowFunc(("rc = %Rrc\n", rc));