Changeset 78164 in vbox

Timestamp:

Apr 17, 2019 2:16:01 PM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Check if we (already) have client data in vboxClipboardSyncInternal(), and bail out if we don't.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-win.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc.cpp (modified) (1 diff)

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

@@ -560 +560 @@
 static int vboxClipboardSyncInternal(PVBOXCLIPBOARDCONTEXT pCtx)
 {
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+
+    if (pCtx->pClient == NULL) /* If we don't have any client data (yet), bail out. */
+        return VINF_SUCCESS;
+
     uint32_t uFormats;
     int rc = VBoxClipboardWinGetFormats(&pCtx->Win, &uFormats);

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

@@ -246 +246 @@
 void vboxSvcClipboardReportMsg (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Msg, uint32_t u32Formats)
 {
+    AssertPtrReturnVoid(pClient);
+
     if (VBoxSvcClipboardLock())
     {