Changeset 91740 in vbox for trunk/src/VBox/Additions

Timestamp:

Oct 14, 2021 7:28:04 PM (3 years ago)

Author:

vboxsync

Message:

VbglR3ClipboardWriteDataEx: Don't validate pvData when cbData == 0, as it's perferectly valid to write a zero byte reply to a host's request. bugref:10094

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (3 diffs)

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

@@ -2462 +2462 @@
  *
  * @returns VBox status code.
- * @param   idClient        The client id returned by VbglR3ClipboardConnect().
- * @param   fFormat         The format of the data.
- * @param   pv              The data.
- * @param   cb              The size of the data.
+ * @param   idClient    The client id returned by VbglR3ClipboardConnect().
+ * @param   fFormat     The format of the data.
+ * @param   pvData      Pointer to the data to send.  Can be NULL if @a cbData
+ *                      is zero.
+ * @param   cbData      Number of bytes of data to send.  Zero is valid.
  */
 VBGLR3DECL(int) VbglR3ClipboardWriteData(HGCMCLIENTID idClient, uint32_t fFormat, void *pv, uint32_t cb)
@@ -2494 +2495 @@
  *
  * @returns VBox status code.
- * @param   pCtx                The command context returned by VbglR3ClipboardConnectEx().
- * @param   uFormat             Clipboard format to send.
- * @param   pvData              Pointer to data to send.
- * @param   cbData              Size (in bytes) of data to send.
- */
-VBGLR3DECL(int) VbglR3ClipboardWriteDataEx(PVBGLR3SHCLCMDCTX pCtx, SHCLFORMAT uFormat, void *pvData, uint32_t cbData)
-{
-    AssertPtrReturn(pCtx,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pvData, VERR_INVALID_POINTER);
+ * @param   pCtx        The command context returned by VbglR3ClipboardConnectEx().
+ * @param   fFormat     Clipboard format to send.
+ * @param   pvData      Pointer to the data to send.  Can be NULL if @a cbData
+ *                      is zero.
+ * @param   cbData      Number of bytes of data to send.  Zero is valid.
+ */
+VBGLR3DECL(int) VbglR3ClipboardWriteDataEx(PVBGLR3SHCLCMDCTX pCtx, SHCLFORMAT fFormat, void *pvData, uint32_t cbData)
+{
+    LogFlowFunc(("ENTER: fFormat=%#x pvData=%p cbData=%#x\n", fFormat, pvData, cbData));
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+    if (cbData > 0)
+        AssertPtrReturn(pvData, VERR_INVALID_POINTER);
 
     int rc;
-
-    LogFlowFuncEnter();
-
     if (pCtx->fUseLegacyProtocol)
-    {
-        rc = VbglR3ClipboardWriteData(pCtx->idClient, uFormat, pvData, cbData);
-    }
+        rc = VbglR3ClipboardWriteData(pCtx->idClient, fFormat, pvData, cbData);
     else
     {
@@ -2522 +2521 @@
         VBGL_HGCM_HDR_INIT(&Msg.Hdr, pCtx->idClient, VBOX_SHCL_GUEST_FN_DATA_WRITE, VBOX_SHCL_CPARMS_DATA_WRITE);
         Msg.Parms.id64Context.SetUInt64(pCtx->idContext);
-        Msg.Parms.f32Format.SetUInt32(uFormat);
+        Msg.Parms.f32Format.SetUInt32(fFormat);
         Msg.Parms.pData.SetPtr(pvData, cbData);