Changeset 100499 in vbox for trunk

Timestamp:

Jul 11, 2023 8:00:15 AM (22 months ago)

Author:

vboxsync

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

158280

Message:

Shared Clipboard: List entry reading fixes. bugref:9437

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (3 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

@@ -776 +776 @@
             uint32_t fInfoRet;
             rc = Msg.Parms.fInfo.GetUInt32(&fInfoRet);
-            AssertRCReturn(rc, rc);
-            AssertMsgStmt((fInfoRet & VBOX_SHCL_INFO_F_FSOBJINFO) == VBOX_SHCL_INFO_F_FSOBJINFO,
-                          ("Host returned unknown entry info flags (%#x)\n", fInfoRet), rc = VERR_INVALID_PARAMETER);
             if (RT_SUCCESS(rc))
             {
-                uint32_t cbInfoRet = 0;
-                Msg.cbInfo.GetUInt32(&cbInfoRet);
-
-                AssertMsgStmt(cbInfo == cbInfoRet,
-                              ("Host reported cbInfo %RU32, expected %RU32\n", cbInfoRet, cbInfo), rc = VERR_INVALID_PARAMETER);
-
-                rc = ShClTransferListEntryInitEx(pRootListEntry, fInfo, szName, pvInfo, cbInfo);
+                AssertMsgStmt((fInfoRet & VBOX_SHCL_INFO_F_FSOBJINFO) == VBOX_SHCL_INFO_F_FSOBJINFO,
+                              ("Host returned unknown root entry info flags (%#x)\n", fInfoRet), rc = VERR_INVALID_PARAMETER);
                 if (RT_SUCCESS(rc))
                 {
-                    pvInfo = NULL;  /* Entry took ownership of pvInfo now. */
-                    cbInfo = 0;
+                    uint32_t cbInfoRet = 0;
+                    rc = Msg.cbInfo.GetUInt32(&cbInfoRet);
+                    if (RT_SUCCESS(rc))
+                    {
+                        AssertMsgStmt(cbInfo == cbInfoRet,
+                                      ("Host reported cbInfo %RU32, expected %RU32\n", cbInfoRet, cbInfo), rc = VERR_INVALID_PARAMETER);
+                        if (RT_SUCCESS(rc))
+                            rc = ShClTransferListEntryInitEx(pRootListEntry, fInfo, szName, pvInfo, cbInfo);
+                        if (RT_SUCCESS(rc))
+                        {
+                            pvInfo = NULL;  /* Entry took ownership of pvInfo now. */
+                            cbInfo = 0;
+                        }
+                    }
                 }
             }
@@ -1420 +1424 @@
                        VBOX_SHCL_GUEST_FN_LIST_ENTRY_READ, VBOX_SHCL_CPARMS_LIST_ENTRY);
 
+    uint32_t const fInfo = VBOX_SHCL_INFO_F_FSOBJINFO; /* For now the only info we have. */
+
     Msg.ReqParms.uContext.SetUInt64(pCtx->idContext);
     Msg.ReqParms.uHandle.SetUInt64(hList);
-    Msg.ReqParms.fInfo.SetUInt32(0);
-
-    Msg.szName.SetPtr(pListEntry->pszName, pListEntry->cbName);
-    Msg.cbInfo.SetUInt32(pListEntry->cbInfo);
-    Msg.pvInfo.SetPtr(pListEntry->pvInfo, pListEntry->cbInfo);
-
-    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
-    if (RT_SUCCESS(rc))
-    {
-        rc = Msg.cbInfo.GetUInt32(&pListEntry->cbInfo); AssertRC(rc);
-    }
+    Msg.ReqParms.fInfo.SetUInt32(fInfo);
+
+    char szName[SHCLLISTENTRY_MAX_NAME];
+    Msg.szName.SetPtr(szName, sizeof(szName));
+
+    void    *pvInfo = NULL;
+    uint32_t cbInfo = 0;
+
+    int rc = VINF_SUCCESS;
+
+    if ((fInfo & VBOX_SHCL_INFO_F_FSOBJINFO) == VBOX_SHCL_INFO_F_FSOBJINFO)
+    {
+        cbInfo = sizeof(SHCLFSOBJINFO);
+        pvInfo = RTMemAlloc(cbInfo);
+        if (!pvInfo)
+            rc = VERR_NO_MEMORY;
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        Msg.cbInfo.SetUInt32(cbInfo);
+        Msg.pvInfo.SetPtr(pvInfo, cbInfo);
+
+        rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+        if (RT_SUCCESS(rc))
+        {
+            uint32_t cbInfoRet = 0;
+            rc = Msg.cbInfo.GetUInt32(&cbInfoRet);
+            if (RT_SUCCESS(rc))
+            {
+                AssertMsgStmt(cbInfo == cbInfoRet,
+                              ("Host reported cbInfo %RU32, expected %RU32\n", cbInfoRet, cbInfo), rc = VERR_INVALID_PARAMETER);
+                if (RT_SUCCESS(rc))
+                    rc = ShClTransferListEntryInitEx(pListEntry, fInfo, szName, pvInfo, cbInfo);
+                if (RT_SUCCESS(rc))
+                {
+                    pvInfo = NULL;  /* Entry took ownership of pvInfo now. */
+                    cbInfo = 0;
+                }
+            }
+        }
+        else
+            LogRel(("Shared Clipboard: Reading list entry failed: %Rrc\n", rc));
+    }
+
+    RTMemFree(pvInfo);
 
     LogFlowFuncLeaveRC(rc);
@@ -2514 +2555 @@
 
                     SHCLLISTENTRY entryList;
-                    rc = ShClTransferListRead(pTransfer, hList, &entryList);
+                    rc = ShClTransferListEntryInit(&entryList);
                     if (RT_SUCCESS(rc))
                     {
-                        PSHCLFSOBJINFO pObjInfo = (PSHCLFSOBJINFO)entryList.pvInfo;
-                        Assert(entryList.cbInfo == sizeof(SHCLFSOBJINFO));
-
-                        RT_NOREF(pObjInfo);
-
-                        LogFlowFunc(("\t%s (%RU64 bytes)\n", entryList.pszName, pObjInfo->cbObject));
-
-                        rc = VbglR3ClipboardTransferListEntryWrite(pCmdCtx, hList, &entryList);
-
-                        ShClTransferListEntryDestroy(&entryList);
+                        rc = ShClTransferListRead(pTransfer, hList, &entryList);
+                        if (RT_SUCCESS(rc))
+                        {
+                            PSHCLFSOBJINFO pObjInfo = (PSHCLFSOBJINFO)entryList.pvInfo;
+                            Assert(entryList.cbInfo == sizeof(SHCLFSOBJINFO));
+
+                            RT_NOREF(pObjInfo);
+
+                            LogFlowFunc(("\t%s (%RU64 bytes)\n", entryList.pszName, pObjInfo->cbObject));
+
+                            rc = VbglR3ClipboardTransferListEntryWrite(pCmdCtx, hList, &entryList);
+
+                            ShClTransferListEntryDestroy(&entryList);
+                        }
                     }
                 }

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

@@ -1278 +1278 @@
  * @param   cParms              Number of HGCM parameters supplied in \a aParms.
  * @param   aParms              Array of HGCM parameters.
- * @param   pListEntry          Pointer list entry to set.
+ * @param   pEntry              Pointer list entry to set.
  */
 static int shClSvcTransferSetListEntry(uint32_t cParms, VBOXHGCMSVCPARM aParms[],
-                                       PSHCLLISTENTRY pListEntry)
+                                       PSHCLLISTENTRY pEntry)
 {
     int rc;
 
     /* Sanity. */
-    AssertReturn(ShClTransferListEntryIsValid(pListEntry), VERR_INVALID_PARAMETER);
+    AssertReturn(ShClTransferListEntryIsValid(pEntry), VERR_INVALID_PARAMETER);
 
     if (cParms == VBOX_SHCL_CPARMS_LIST_ENTRY)
     {
-        HGCMSvcSetPv (&aParms[3], pListEntry->pszName, pListEntry->cbName);
-        HGCMSvcSetU32(&aParms[4], pListEntry->cbInfo);
-        HGCMSvcSetPv (&aParms[5], pListEntry->pvInfo, pListEntry->cbInfo);
+        /* Entry name */
+        void  *pvDst = aParms[3].u.pointer.addr;
+        size_t cbDst = aParms[3].u.pointer.size;
+        memcpy(pvDst, pEntry->pszName, RT_MIN(pEntry->cbName, cbDst));
+
+        /* Info size */
+        HGCMSvcSetU32(&aParms[4], pEntry->cbInfo);
+
+        /* Info data */
+        pvDst = aParms[5].u.pointer.addr;
+        cbDst = aParms[5].u.pointer.size;
+        memcpy(pvDst, pEntry->pvInfo, RT_MIN(pEntry->cbInfo, cbDst));
 
         rc = VINF_SUCCESS;