Changeset 78533 in vbox for trunk/src/VBox/Additions/WINNT/SharedFolders/driver/info.cpp

Timestamp:

May 15, 2019 2:35:48 PM (6 years ago)

Author:

vboxsync

Message:

winnt/vboxsf: Fixed bug recently introduced in vbsfNtQueryFsVolumeInfo in the buffer-halfwas-too-small case. bugref:9172

File:

• trunk/src/VBox/Additions/WINNT/SharedFolders/driver/info.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/info.cpp

@@ -679 +679 @@
             memcpy(pInfo->VolumeLabel, VBOX_VOLNAME_PREFIX, RT_MIN(cbLeft, VBOX_VOLNAME_PREFIX_SIZE));
             if (cbLeft > VBOX_VOLNAME_PREFIX_SIZE)
-                memcpy(&pInfo->VolumeLabel[VBOX_VOLNAME_PREFIX_SIZE / sizeof(WCHAR)], pwcShareName, cbShareName);
+            {
+                cbLeft -= VBOX_VOLNAME_PREFIX_SIZE;
+                memcpy(&pInfo->VolumeLabel[VBOX_VOLNAME_PREFIX_SIZE / sizeof(WCHAR)], pwcShareName, RT_MIN(cbLeft, cbShareName));
+            }
             Log(("VBOXSF: VBoxMRxQueryVolumeInfo: FileFsVolumeInformation: partial result (%#x, needed %#x)\n",
                  cbCopied, cbCopied + cbVolLabel));