Changeset 92239 in vbox for trunk

Timestamp:

Nov 5, 2021 2:14:54 PM (3 years ago)

Author:

vboxsync

Message:

SharedClipboard: Poor code structure in svcConnect made it forget to call ShClBackendDisconnect on ShClBackendSync failure. bugref:10135

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp

@@ -496 +496 @@
 void shClSvcMsgAdd(PSHCLCLIENT pClient, PSHCLCLIENTMSG pMsg, bool fAppend)
 {
-    Assert(RTCritSectIsOwned(&pClient->CritSect));
+    Assert(RTCritSectIsOwner(&pClient->CritSect));
     AssertPtr(pMsg);
 
@@ -522 +522 @@
 int shClSvcMsgAddAndWakeupClient(PSHCLCLIENT pClient, PSHCLCLIENTMSG pMsg)
 {
-    Assert(RTCritSectIsOwned(&pClient->CritSect));
+    Assert(RTCritSectIsOwner(&pClient->CritSect));
     AssertPtr(pMsg);
     AssertPtr(pClient);
@@ -2071 +2071 @@
             if (RT_SUCCESS(rc))
             {
-                /* For now we ASSUME that the first client ever connected is in charge for
-                 * communicating withe the service extension.
-                 *
-                 ** @todo This needs to be fixed ASAP w/o breaking older guest / host combos. */
+                /* For now we ASSUME that the first client that connects is in charge for
+                   communicating with the service extension. */
+                /** @todo This isn't optimal, but only the guest really knows which client is in
+                 *        focus on the console. See @bugref{10115} for details. */
                 if (g_ExtState.uClientID == 0)
                     g_ExtState.uClientID = u32ClientID;
+
+                LogFunc(("Successfully connected client %#x\n", u32ClientID));
+                return rc;
             }
-        }
-
-        if (RT_FAILURE(rc))
-        {
-            shClSvcClientDestroy(pClient);
-        }
-
-    }
-
+
+            LogFunc(("ShClBackendSync failed: %Rrc\n", rc));
+            ShClBackendDisconnect(pClient);
+        }
+        else
+            LogFunc(("ShClBackendConnect failed: %Rrc\n", rc));
+        shClSvcClientDestroy(pClient);
+    }
+    else
+        LogFunc(("shClSvcClientInit failed: %Rrc\n", rc));
     LogFlowFuncLeaveRC(rc);
     return rc;