Changeset 85798 in vbox

Timestamp:

Aug 17, 2020 12:55:46 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139955

Message:

Shared Clipboard/X11: Only write clipboard data when clipboard request has succeeded.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -191 +191 @@
  *
  * @param  pCtx                 Our context information.
- * @param  rc                   The IPRT result code of the request.
+ * @param  rcCompletion         The completion status of the request.
  * @param  pReq                 The request structure that we passed in when we started
  *                              the request.  We RTMemFree() this in this function.
@@ -197 +197 @@
  * @param  cb                   The size of the data in @a pv.
  */
-DECLCALLBACK(void) ShClX11RequestFromX11CompleteCallback(PSHCLCONTEXT pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
-{
-    RT_NOREF(pCtx, rc);
-
-    LogFlowFunc(("rc=%Rrc, Format=0x%x, pv=%p, cb=%RU32\n", rc, pReq->Format, pv, cb));
-
-    int rc2 = VbglR3ClipboardWriteDataEx(&pCtx->CmdCtx, pReq->Format, pv, cb);
-    RT_NOREF(rc2);
+DECLCALLBACK(void) ShClX11RequestFromX11CompleteCallback(PSHCLCONTEXT pCtx,
+                                                         int rcCompletion, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
+{
+    LogFlowFunc(("rcCompletion=%Rrc, Format=0x%x, pv=%p, cb=%RU32\n", rcCompletion, pReq->Format, pv, cb));
+
+    if (RT_SUCCESS(rcCompletion)) /* Only write data if the request succeeded. */
+    {
+        AssertPtrReturnVoid(pv);
+        AssertReturnVoid(pv);
+
+        rcCompletion = VbglR3ClipboardWriteDataEx(&pCtx->CmdCtx, pReq->Format, pv, cb);
+    }
 
     RTMemFree(pReq);
 
-    LogFlowFuncLeaveRC(rc2);
+    LogFlowFuncLeaveRC(rcCompletion);
 }