Changeset 102468 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Dec 5, 2023 10:37:41 AM (15 months ago)

Author:

vboxsync

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

160611

Message:

Shared Clipboard: Added a dedicated event type for the X11 requests/responses. Needed for union access. Added some more checks. ​bugref:10384

File:

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

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

@@ -93 +93 @@
                         if (pPayload)
                         {
-                            Assert(pPayload->cbData == sizeof(SHCLX11RESPONSE));
+                            AssertReturnVoid(pPayload->cbData == sizeof(SHCLX11RESPONSE));
+                            AssertReturnVoid(pPayload->pvData);
                             PSHCLX11RESPONSE pResp = (PSHCLX11RESPONSE)pPayload->pvData;
+                            AssertReturnVoid(pResp->enmType == SHCLX11EVENTTYPE_READ);
 
                             rc = ShClTransferRootsInitFromStringListEx(pTransfer, (const char *)pResp->Read.pvData, pResp->Read.cbData,
@@ -559 +561 @@
                                 if (pPayload)
                                 {
-                                    Assert(pPayload->cbData == sizeof(SHCLX11RESPONSE));
+                                    AssertBreakStmt(pPayload->cbData == sizeof(SHCLX11RESPONSE), rc = VERR_INVALID_PARAMETER);
+                                    AssertPtrBreakStmt(pPayload->pvData, rc = VERR_INVALID_POINTER);
                                     PSHCLX11RESPONSE pResp = (PSHCLX11RESPONSE)pPayload->pvData;
+                                    AssertBreakStmt(pResp->enmType == SHCLX11EVENTTYPE_READ, rc = VERR_INVALID_PARAMETER);
 
                                     rc = VbglR3ClipboardWriteDataEx(&pCtx->CmdCtx, pEvent->u.fReadData,