Changeset 107723 in vbox for trunk

Timestamp:

Jan 13, 2025 8:18:09 PM (4 weeks ago)

Author:

vboxsync

Message:

Storage/VMDK.cpp: Fix unused variable assignment parfait report by restructuring the code a little bit, bugref:3409

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (3 diffs)

trunk/src/VBox/Storage/VMDK.cpp

@@ -8628 +8628 @@
                                 uint64_t cSectorsNew)
 {
-    int rc = VINF_SUCCESS;
     uint32_t cOldGDEntries = pExtent->cGDEntries;
 
@@ -8656 +8655 @@
     AssertCompile(sizeof(g_abRTZero4K) >= VMDK_GRAIN_TABLE_SIZE);
 
+    /* Allocate data buffer. */
+    pvBuf = RTMemAllocZ(VMDK_GRAIN_TABLE_SIZE);
+    if (!pvBuf)
+        return VERR_NO_MEMORY;
+
+    int rc;
     do
     {
-        /* Allocate data buffer. */
-        pvBuf = RTMemAllocZ(VMDK_GRAIN_TABLE_SIZE);
-        if (!pvBuf)
-        {
-            rc = VERR_NO_MEMORY;
-            break;
-        }
-
         uint32_t uGTStart = VMDK_SECTOR2BYTE(pExtent->uSectorGD) + (cOldGDEntries * VMDK_GRAIN_DIR_ENTRY_SIZE);
 
@@ -8766 +8763 @@
     } while (0);
 
-    if (pvBuf)
-    {
-        RTMemFree(pvBuf);
-        pvBuf = NULL;
-    }
+    RTMemFree(pvBuf);
+    pvBuf = NULL;
 
     pExtent->cGDEntries = cNewDirEntries;