Changeset 58232 in vbox

Timestamp:

Oct 14, 2015 12:03:29 PM (9 years ago)

Author:

vboxsync

Message:

DnD: More validation.

Location:

trunk/src/VBox/Main

Files:

• include/GuestDnDPrivate.h (modified) (1 diff)
• src-client/GuestDnDPrivate.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -596 +596 @@
             return VINF_SUCCESS;
         }
+
+        if (!RTStrIsValidEncoding(pszList))
+            return VERR_INVALID_PARAMETER;
 
         RTCList<RTCString> lstURIOrg = RTCString(pszList, cbList).split("\r\n");

trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp

@@ -388 +388 @@
             AssertReturn(DragAndDropSvc::CB_MAGIC_DND_HG_REQ_DATA == pCBData->hdr.u32Magic, VERR_INVALID_PARAMETER);
 
-            if (   pCBData->cbFormat == 0
-                || pCBData->cbFormat > _64K) /** @todo Make this configurable? */
+            if (   pCBData->cbFormat  == 0
+                || pCBData->cbFormat  > _64K /** @todo Make this configurable? */
+                || pCBData->pszFormat == NULL)
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else if (!RTStrIsValidEncoding(pCBData->pszFormat))
             {
                 rc = VERR_INVALID_PARAMETER;
@@ -427 +432 @@
             AssertReturn(DragAndDropSvc::CB_MAGIC_DND_GH_ACK_PENDING == pCBData->hdr.u32Magic, VERR_INVALID_PARAMETER);
 
-            if (   pCBData->cbFormat == 0
-                || pCBData->cbFormat > _64K) /** @todo Make the maximum size configurable? */
+            if (   pCBData->cbFormat  == 0
+                || pCBData->cbFormat  > _64K /** @todo Make the maximum size configurable? */
+                || pCBData->pszFormat == NULL)
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else if (!RTStrIsValidEncoding(pCBData->pszFormat))
             {
                 rc = VERR_INVALID_PARAMETER;