Changeset 100237 in vbox

Timestamp:

Jun 21, 2023 11:35:44 AM (21 months ago)

Author:

vboxsync

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

157947

Message:

Shared Clipboard: Fixed reading data from X11 host clipboard. bugref:9437

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (1 diff)

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

@@ -275 +275 @@
                     PSHCLX11RESPONSE pResp = (PSHCLX11RESPONSE)pPayload->pvData;
 
-                    size_t const cbToCopy = RT_MIN(cbData, pPayload->cbData);
+                    uint32_t const cbRead = pResp->Read.cbData;
+
+                    size_t const cbToCopy = RT_MIN(cbData, cbRead);
                     if (cbToCopy) /* memcpy doesn't like 0 byte inputs. */
-                        memcpy(pvData, pResp->Read.pvData, RT_MIN(cbData, pPayload->cbData));
-
-                    LogRel2(("Shared Clipboard: Read %RU32 bytes host X11 clipboard data\n", pResp->Read.cbData));
-
-                    *pcbActual = pResp->Read.cbData;
+                        memcpy(pvData, pResp->Read.pvData, RT_MIN(cbData, cbRead));
+
+                    LogRel2(("Shared Clipboard: Read %RU32 bytes host X11 clipboard data\n", cbRead));
+
+                    *pcbActual = cbRead;
 
                     RTMemFree(pResp->Read.pvData);