Changeset 51253 in vbox for trunk/src/VBox/Additions/WINNT/SharedFolders

Timestamp:

May 14, 2014 7:38:18 PM (11 years ago)

Author:

vboxsync

Message:

Additions/win/SharedFolders: strip trailing \0 in MAP_FOLDER

File:

• trunk/src/VBox/Additions/WINNT/SharedFolders/driver/net.c (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/net.c

@@ -176 +176 @@
 
         RootNameLength = pNetRoot->pNetRootName->Length - pSrvCall->pSrvCallName->Length;
-        if (!RootNameLength)
+        if (RootNameLength < sizeof(WCHAR))
         {
             /* Refuse a netroot path with an empty shared folder name */
@@ -187 +187 @@
 
         RootNameLength -= sizeof(WCHAR); /* Remove leading backslash. */
-
         pRootName = (PWCHAR)(pNetRoot->pNetRootName->Buffer + (pSrvCall->pSrvCallName->Length / sizeof(WCHAR)));
         pRootName++; /* Remove leading backslash. */
 
+        /* Strip the trailing \0. Sometimes there is one, sometimes not... */
+        if (   RootNameLength >= sizeof(WCHAR)
+            && pRootName[RootNameLength / sizeof(WCHAR) - 1] == 0)
+            RootNameLength -= sizeof(WCHAR);
+
         if (pNetRootExtension->phgcmClient == NULL)
         {
@@ -196 +200 @@
                  RootNameLength, RootNameLength / sizeof(WCHAR), pRootName));
 
-            /* Calculate length required for parsed path.
-             */
-            ParsedPathSize = sizeof(*ParsedPath) + RootNameLength + sizeof(WCHAR);
-
+            /* Calculate the length required for parsed path. */
+            ParsedPathSize = sizeof(SHFLSTRING) + RootNameLength + sizeof(WCHAR);
             ParsedPath = (PSHFLSTRING)vbsfAllocNonPagedMem(ParsedPathSize);
             if (!ParsedPath)
@@ -209 +211 @@
 
             ShflStringInitBuffer(ParsedPath, ParsedPathSize - sizeof(SHFLSTRING));
-
             ParsedPath->u16Size = (uint16_t)RootNameLength + sizeof(WCHAR);
             ParsedPath->u16Length = ParsedPath->u16Size - sizeof(WCHAR); /* without terminating null */