Changeset 102468 in vbox

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

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard-x11.h (modified) (3 diffs)
• src/VBox/Additions/x11/VBoxClient/clipboard-x11.cpp (modified) (2 diffs)
• src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (7 diffs)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (2 diffs)

trunk/include/VBox/GuestHost/SharedClipboard-x11.h

@@ -168 +168 @@
 
 /**
+ * Enumeration for an X11 event type.
+ */
+typedef enum _SHCLX11EVENTTYPE
+{
+    /** Invalid event type. */
+    SHCLX11EVENTTYPE_INVALID = 0,
+    /** Reports formats to X11. */
+    SHCLX11EVENTTYPE_REPORT_FORMATS,
+    /** Reads clipboard from X11. */
+    SHCLX11EVENTTYPE_READ
+} SHCLX11EVENTTYPE;
+/** Pointer to an enumeration for an X11 event type. */
+typedef SHCLX11EVENTTYPE *PSHCLX11EVENTTYPE;
+
+/**
  * Structure describing an X11 clipboard request.
  */
@@ -176 +191 @@
     /** Event associated to this request. */
     PSHCLEVENT       pEvent;
+    /** Request type for the union below. */
+    SHCLX11EVENTTYPE enmType;
     union
     {
@@ -204 +221 @@
 typedef struct _SHCLX11RESPONSE
 {
-    int rc;
-    struct
+    /** Response type for the union below. */
+    SHCLX11EVENTTYPE enmType;
+    /** rc (IPRT-style) of the operation performed as part of the X event thread. */
+    int              rc;
+    union
     {
-        void    *pvData;
-        uint32_t cbData;
-    } Read;
+        struct
+        {
+            void    *pvData;
+            uint32_t cbData;
+        } Read;
+    };
 } SHCLX11RESPONSE;
 /** Pointer to an X11 clipboard response. */

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,

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

@@ -1980 +1980 @@
 
     PSHCLX11REQUEST pReq = (PSHCLX11REQUEST)pvUserData;
+    AssertReturnVoid(pReq->enmType == SHCLX11EVENTTYPE_REPORT_FORMATS);
 
     PSHCLX11CTX pCtx     = pReq->pCtx;
@@ -2020 +2021 @@
     if (pReq)
     {
+        pReq->enmType          = SHCLX11EVENTTYPE_REPORT_FORMATS;
         pReq->pCtx             = pCtx;
         pReq->Formats.fFormats = uFormats;
@@ -2121 +2123 @@
 
     /* Sanity. */
+    AssertReturnVoid(pReq->enmType == SHCLX11EVENTTYPE_READ);
     AssertReturnVoid(pReq->Read.uFmtVBox != VBOX_SHCL_FMT_NONE);
     AssertReturnVoid(pReq->Read.idxFmtX11 < SHCL_MAX_X11_FORMATS);
@@ -2379 +2382 @@
         if (pReq) /* Give some more clues, if available. */
         {
+            AssertReturnVoid(pReq->enmType == SHCLX11EVENTTYPE_READ);
             char *pszFmts = ShClFormatsToStrA(pReq->Read.uFmtVBox);
             AssertPtrReturnVoid(pszFmts);
@@ -2475 +2479 @@
 
     PSHCLX11REQUEST   pReq = (PSHCLX11REQUEST)pvUserData;
+    AssertReturnVoid(pReq->enmType == SHCLX11EVENTTYPE_READ);
     SHCLX11CTX       *pCtx = pReq->pCtx;
     AssertPtrReturnVoid(pCtx);
@@ -2582 +2587 @@
     if (pReq)
     {
+        pReq->enmType       = SHCLX11EVENTTYPE_READ;
         pReq->pCtx          = pCtx;
         pReq->Read.uFmtVBox = uFmt;
@@ -2636 +2642 @@
                 if (pPayload)
                 {
-                    Assert(pPayload->cbData == sizeof(SHCLX11RESPONSE));
+                    AssertReturn(pPayload->cbData == sizeof(SHCLX11RESPONSE), VERR_INVALID_PARAMETER);
+                    AssertPtrReturn(pPayload->pvData, VERR_INVALID_POINTER);
                     PSHCLX11RESPONSE pResp = (PSHCLX11RESPONSE)pPayload->pvData;
+                    AssertReturn(pResp->enmType == SHCLX11EVENTTYPE_READ, VERR_INVALID_PARAMETER);
 
                     memcpy(pvBuf, pResp->Read.pvData, RT_MIN(cbBuf, pResp->Read.cbData));

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

@@ -307 +307 @@
                 if (pPayload)
                 {
-                    Assert(pPayload->cbData == sizeof(SHCLX11RESPONSE));
+                    AssertReturn(pPayload->cbData == sizeof(SHCLX11RESPONSE), VERR_INVALID_PARAMETER);
+                    AssertPtrReturn(pPayload->pvData, VERR_INVALID_POINTER);
                     PSHCLX11RESPONSE pResp = (PSHCLX11RESPONSE)pPayload->pvData;
+                    AssertReturn(pResp->enmType == SHCLX11EVENTTYPE_READ, VERR_INVALID_PARAMETER);
 
                     uint32_t const cbRead = pResp->Read.cbData;
@@ -732 +734 @@
                 if (pPayload)
                 {
-                    Assert(pPayload->cbData == sizeof(SHCLX11RESPONSE));
-                    AssertPtr(pPayload->pvData);
+                    AssertReturn(pPayload->cbData == sizeof(SHCLX11RESPONSE), VERR_INVALID_PARAMETER);
+                    AssertPtrReturn(pPayload->pvData, VERR_INVALID_POINTER);
                     PSHCLX11RESPONSE pResp = (PSHCLX11RESPONSE)pPayload->pvData;
+                    AssertReturn(pResp->enmType == SHCLX11EVENTTYPE_READ, VERR_INVALID_PARAMETER);
 
                     rc = ShClTransferRootsInitFromStringList(pCtx->pTransfer,