Changeset 81152 in vbox for trunk

Timestamp:

Oct 8, 2019 1:30:43 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/HostService: Crash fix on X11 hosts.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-x11.cpp (modified) (3 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (2 diffs)

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

@@ -168 +168 @@
 
     PSHCLCONTEXT pCtx = pClient->State.pCtx;
+    AssertPtr(pCtx);
 
     /* Drop the reference to the client, in case it is still there.  This
@@ -173 +174 @@
      * immediately. */
     pCtx->fShuttingDown = true;
-
-    /* If there is a currently pending request, release it immediately. */
-    SHCLDATABLOCK dataBlock = { 0, NULL, 0 };
-    ShClSvcImplWriteData(pClient, NULL, &dataBlock);
 
     int rc = ClipStopX11(pCtx->pBackend);
@@ -304 +301 @@
                          PSHCLCLIENTCMDCTX pCmdCtx, PSHCLDATABLOCK pData)
 {
+    AssertPtrReturn(pClient, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCmdCtx, VERR_INVALID_POINTER);
+    AssertPtrReturn(pData,   VERR_INVALID_POINTER);
+
     LogFlowFunc(("pClient=%p, pv=%p, cb=%RU32, uFormat=%02X\n",
                  pClient, pData->pvData, pData->cbData, pData->uFormat));

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

@@ -900 +900 @@
                           PSHCLDATABLOCK pData)
 {
+    AssertPtrReturn(pClient, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCmdCtx, VERR_INVALID_POINTER);
+    AssertPtrReturn(pData,   VERR_INVALID_POINTER);
+
     SHCLEVENTID uEvent;
     if (pClient->State.uProtocolVer == 0)
@@ -1111 +1115 @@
 static DECLCALLBACK(int) svcDisconnect(void *, uint32_t u32ClientID, void *pvClient)
 {
-    RT_NOREF(u32ClientID, pvClient);
-
     LogFunc(("u32ClientID=%RU32\n", u32ClientID));