Changeset 41013 in vbox for trunk/src/VBox/HostServices/SharedFolders

Timestamp:

Apr 20, 2012 1:47:13 PM (13 years ago)

Author:

vboxsync

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

77571

Message:

SharedFolders: fixed read beyond buffer

File:

• trunk/src/VBox/HostServices/SharedFolders/mappings.cpp (modified) (1 diff)

trunk/src/VBox/HostServices/SharedFolders/mappings.cpp

@@ -430 +430 @@
     if (pFolderMapping->fValid == true)
     {
-        pString->u16Length = pFolderMapping->pMapName->u16Length;
-        memcpy(pString->String.ucs2, pFolderMapping->pMapName->String.ucs2, pString->u16Size);
+        if (pString->u16Size < pFolderMapping->pMapName->u16Size)
+        {
+            Log(("vbsfMappingsQuery: passed string too short (%d < %d bytes)!\n",
+                pString->u16Size,  pFolderMapping->pMapName->u16Size));
+            rc = VERR_INVALID_PARAMETER;
+        }
+        else
+        {
+            pString->u16Length = pFolderMapping->pMapName->u16Length;
+            memcpy(pString->String.ucs2, pFolderMapping->pMapName->String.ucs2,
+                   pFolderMapping->pMapName->u16Size);
+        }
     }
     else