Changeset 13340 in vbox

Timestamp:

Oct 16, 2008 1:16:33 PM (16 years ago)

Author:

vboxsync

Message:

#3230: Memory leaks fixed in VHD backend

Location:

trunk/src/VBox/Devices/Storage

Files:

• VHDHDDCore.cpp (modified) (6 diffs)
• testcase/tstVD.cpp (modified) (3 diffs)

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

@@ -802 +802 @@
 }
 
+static void vhdFreeImageMemory(PVHDIMAGE pImage)
+{
+    if (pImage->pszParentFilename)
+    {
+        RTStrFree(pImage->pszParentFilename);
+        pImage->pszParentFilename = NULL;
+    }
+    if (pImage->pBlockAllocationTable)
+    {
+        RTMemFree(pImage->pBlockAllocationTable);
+        pImage->pBlockAllocationTable = NULL;
+    }
+    if (pImage->pu8Bitmap)
+    {
+        RTMemFree(pImage->pu8Bitmap);
+        pImage->pu8Bitmap = NULL;
+    }
+    RTMemFree(pImage);
+}
+
 static int vhdFreeImage(PVHDIMAGE pImage)
 {
@@ -811 +831 @@
         vhdFlush(pImage);
         RTFileClose(pImage->File);
-        RTMemFree(pImage);
+        vhdFreeImageMemory(pImage);
     }
 
@@ -826 +846 @@
      * not signalled as an error. After all nothing bad happens. */
     if (pImage) {
-        if (pImage->pu8Bitmap)
-        {
-            RTMemFree(pImage->pu8Bitmap);
-            pImage->pu8Bitmap = NULL;
-        }
         if (fDelete)
         {
@@ -836 +851 @@
             RTFileClose(pImage->File);
             RTFileDelete(pImage->pszFilename);
+            vhdFreeImageMemory(pImage);
         }
         else
             rc = vhdFreeImage(pImage);
-        if (pImage->pszParentFilename)
-            RTStrFree(pImage->pszParentFilename);
     }
 
@@ -898 +912 @@
             uint32_t cSectors = 0;
             uint32_t iBitmap = cBATEntryIndex / 8; /* Byte in the block bitmap. */
+            Assert(iBitmap < pImage->cbDataBlockBitmap);
 
             /*
@@ -1109 +1124 @@
         if (pImage->fDynHdrNeedsUpdate)
             vhdDynamicHeaderUpdate(pImage);
+        RTMemFree(pBlockAllocationTableToWrite);
     }
 

trunk/src/VBox/Devices/Storage/testcase/tstVD.cpp

@@ -635 +635 @@
         if (VBOX_FAILURE(rc)) \
         { \
+            if (pvBuf) \
+                RTMemFree(pvBuf); \
             VDDestroy(pVD); \
             return rc; \
         } \
     } while (0)
+
+    void *pvBuf = RTMemAlloc(_1M);
 
     /* Create error interface. */
@@ -672 +676 @@
     PSEGMENT paSegments  = (PSEGMENT)RTMemAllocZ(sizeof(struct Segment) * (nSegments + 1));
 
-    void *pvBuf = RTMemAlloc(_1M);
-
     RNDCTX ctx;
     initializeRandomGenerator(&ctx, u32Seed);
@@ -692 +694 @@
 
     VDDestroy(pVD);
+    if (pvBuf)
+        RTMemFree(pvBuf);
 #undef CHECK
     return 0;