Changeset 86691 in vbox for trunk/src/VBox

Timestamp:

Oct 23, 2020 2:55:35 PM (4 years ago)

Author:

vboxsync

Message:

Shared Clipboard/HostService: Refined ShClX11RequestFromX11CompleteCallback().

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (4 diffs)

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

@@ -277 +277 @@
  * @param  pCtx                 Request context information.
  * @param  rcCompletion         The completion status of the request.
- * @param  pReq                 Request to complete.
+ * @param  pReq                 Request to complete. Will be free'd by the callback.
  * @param  pv                   Address of data from completed request. Optional.
  * @param  cb                   Size (in bytes) of data from completed request. Optional.
@@ -286 +286 @@
                                                          CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
 {
+    AssertPtrReturnVoid(pCtx);
     RT_NOREF(rcCompletion);
+    AssertPtrReturnVoid(pReq);
 
     LogFlowFunc(("rcCompletion=%Rrc, pReq=%p, pv=%p, cb=%RU32, idEvent=%RU32\n", rcCompletion, pReq, pv, cb, pReq->idEvent));
 
-    AssertMsgRC(rcCompletion, ("Clipboard data completion from X11 failed with %Rrc\n", rcCompletion));
-
     if (pReq->idEvent != NIL_SHCLEVENTID)
     {
@@ -297 +297 @@
 
         PSHCLEVENTPAYLOAD pPayload = NULL;
-        if (pv && cb)
+        if (   RT_SUCCESS(rcCompletion)
+            && pv
+            && cb)
         {
             rc2 = ShClPayloadAlloc(pReq->idEvent, pv, cb, &pPayload);
@@ -303 +305 @@
         }
 
-        RTCritSectEnter(&pCtx->pClient->CritSect);
-        rc2 = ShClEventSignal(&pCtx->pClient->EventSrc, pReq->idEvent, pPayload);
-        AssertRC(rc2);
-        RTCritSectLeave(&pCtx->pClient->CritSect);
-    }
-
-    RTMemFree(pReq);
+        rc2 = RTCritSectEnter(&pCtx->pClient->CritSect);
+        if (RT_SUCCESS(rc2))
+        {
+            ShClEventSignal(&pCtx->pClient->EventSrc, pReq->idEvent, pPayload);
+            /* Note: Skip checking if signalling the event is successful, as it could be gone already by now. */
+            RTCritSectLeave(&pCtx->pClient->CritSect);
+        }
+    }
+
+    if (pReq)
+        RTMemFree(pReq);
 }