Changeset 69631 in vbox

Timestamp:

Nov 9, 2017 3:56:04 PM (7 years ago)

Author:

vboxsync

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

118991

Message:

fatvfs: don't match or return volume lables

File:

• trunk/src/VBox/Runtime/common/fs/fatvfs.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/fs/fatvfs.cpp

@@ -2738 +2738 @@
              */
             else if (   fIs8Dot3Name
+                     && !(paEntries[iEntry].Entry.fAttrib & FAT_ATTR_VOLUME)
                      && memcmp(paEntries[iEntry].Entry.achName, szName8Dot3, sizeof(paEntries[iEntry].Entry.achName)) == 0)
             {
@@ -2748 +2749 @@
             else if (   cwcName != 0
                      && idNextSlot == 0
+                     && !(paEntries[iEntry].Entry.fAttrib & FAT_ATTR_VOLUME)
                      && rtFsFatDir_CalcChecksum(&paEntries[iEntry].Entry) == bChecksum
                      && RTUtf16ICmpUtf8(wszName, pszEntry) == 0)
@@ -4150 +4152 @@
             }
             /*
-             * Got a regular directory entry.  Try return it to the caller.
+             * Got a regular directory entry.  Try return it to the caller if not volume label.
              */
-            else
+            else if (!(paEntries[iEntry].Entry.fAttrib & FAT_ATTR_VOLUME))
             {
                 /* Do the length calc and check for overflows. */
@@ -4213 +4215 @@
                 return rc;
             }
+            else
+                cwcName = 0;
         }