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

Timestamp:

Oct 22, 2015 10:34:26 AM (9 years ago)

Author:

vboxsync

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

103586

Message:

DnD: Warnings.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

@@ -1827 +1827 @@
                  strPath.c_str(), strPath.length(), pObj->GetMode()));
 
-    const uint32_t cbPath = strPath.length() + 1; /* Include termination. */
+    if (strPath.length() > RTPATH_MAX)
+        return VERR_INVALID_PARAMETER;
+
+    const uint32_t cbPath = (uint32_t)strPath.length() + 1; /* Include termination. */
 
     VBOXDNDGHSENDDIRMSG Msg;
@@ -2065 +2068 @@
         if (strRootDest.isNotEmpty())
         {
-            void *pvURIList  = (void *)strRootDest.c_str(); /* URI root list. */
-            size_t cbURLIist = strRootDest.length() + 1;    /* Include string termination. */
+            void    *pvURIList = (void *)strRootDest.c_str();        /* URI root list. */
+            uint32_t cbURLIist = (uint32_t)strRootDest.length() + 1; /* Include string termination. */
 
             /* The total size also contains the size of the meta data. */
@@ -2073 +2076 @@
 
             /* We're going to send an URI list in text format. */
-            char szMetaFmt[] = "text/uri-list";
+            const char     szMetaFmt[] = "text/uri-list";
+            const uint32_t cbMetaFmt   = (uint32_t)strlen(szMetaFmt) + 1; /* Include termination. */
 
             VBOXDNDDATAHDR dataHeader;
@@ -2080 +2084 @@
             dataHeader.cbMeta    = cbURLIist;
             dataHeader.pvMetaFmt = (void *)szMetaFmt;
-            dataHeader.cbMetaFmt = strlen(szMetaFmt) + 1; /* Include termination. */
+            dataHeader.cbMetaFmt = cbMetaFmt;
             dataHeader.cObjects  = lstURI.TotalCount();