Changeset 17847 in vbox for trunk/src

Timestamp:

Mar 13, 2009 4:23:42 PM (16 years ago)

Author:

vboxsync

Message:

Storage/VMDK: put decompression buffer allocation in a place where the information is known, plug a few memory leaks in error situations.

File:

• trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

@@ -1225 +1225 @@
         RTMemTmpFree(pTmpGT);
 
+        /* streamOptimized extents need a grain decompress buffer. */
+        pExtent->pvGrain = RTMemAlloc(VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
+        if (!pExtent->pvGrain)
+        {
+            rc = VERR_NO_MEMORY;
+            goto out;
+        }
+
         if (uLastGrainSector)
         {
@@ -1305 +1313 @@
                                  &uGTSectorLE, sizeof(uGTSectorLE), NULL);
             if (RT_FAILURE(rc))
-                return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write new redundant grain directory entry in '%s'"), pExtent->pszFullname);
+            {
+                rc = vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write new redundant grain directory entry in '%s'"), pExtent->pszFullname);
+                goto out;
+            }
             uOffsetSectors += VMDK_BYTE2SECTOR(pExtent->cGTEntries * sizeof(uint32_t));
         }
@@ -1319 +1330 @@
                                  &uGTSectorLE, sizeof(uGTSectorLE), NULL);
             if (RT_FAILURE(rc))
-                return vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write new grain directory entry in '%s'"), pExtent->pszFullname);
+            {
+                rc = vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: cannot write new grain directory entry in '%s'"), pExtent->pszFullname);
+                goto out;
+            }
             uOffsetSectors += VMDK_BYTE2SECTOR(pExtent->cGTEntries * sizeof(uint32_t));
         }
     }
     pExtent->cOverheadSectors = VMDK_BYTE2SECTOR(cbOverhead);
+
+    /* streamOptimized extents need a grain decompress buffer. */
+    if (pExtent->pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
+    {
+        pExtent->pvGrain = RTMemAlloc(VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
+        if (!pExtent->pvGrain)
+        {
+            rc = VERR_NO_MEMORY;
+            goto out;
+        }
+    }
 
 out:
@@ -2501 +2526 @@
     }
 
-    /* streamOptimized extents need a grain decryption buffer. */
-    if (pExtent->pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
-    {
-        pExtent->pvGrain = RTMemAlloc(VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
-        if (!pExtent->pvGrain)
-        {
-            rc = VERR_NO_MEMORY;
-            goto out;
-        }
-        pExtent->uGrainSector = 0;
-    }
-
 out:
     if (RT_FAILURE(rc))
@@ -2720 +2733 @@
         RTStrFree((char *)(void *)pExtent->pszFullname);
         pExtent->pszFullname = NULL;
+    }
+    if (pExtent->pvGrain)
+    {
+        RTMemFree(pExtent->pvGrain);
+        pExtent->pvGrain = NULL;
     }
 }