Changeset 67301 in vbox

Timestamp:

Jun 8, 2017 1:49:41 PM (8 years ago)

Author:

vboxsync

Message:

fatvfs.cpp: Fixed bug in rtFsFatClusterMap_AllocateCluster12 when updating an even numbered previous cluster.

File:

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

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

@@ -1225 +1225 @@
             pbFat[offFat + 1]  = 0xff;
         }
-        else if (   pbFat[offFat]
-                 || pbFat[offFat + 1] & 0x0f)
-        {
-            offFat += 1;
-            idxCluster++;
-            continue;
-        }
         else
         {
+            if (   pbFat[offFat]
+                || pbFat[offFat + 1] & 0x0f)
+            {
+                offFat += 1;
+                idxCluster++;
+                continue;
+            }
+
             /* Set EOC. */
             pbFat[offFat]      = 0xff;
@@ -1254 +1255 @@
             {
                 pbFat[offFatPrev]     = (uint8_t)idxCluster;
-                pbFat[offFatPrev + 1] = (pbFat[offFatPrev] & (uint8_t)0xf0) | ((uint8_t)(idxCluster >> 8) & (uint8_t)0x0f);
+                pbFat[offFatPrev + 1] = (pbFat[offFatPrev + 1] & (uint8_t)0xf0) | ((uint8_t)(idxCluster >> 8) & (uint8_t)0x0f);
             }
             rtFsFatClusterMap_SetDirtyByte(pFatCache, 0, offFatPrev);