Changeset 13295 in vbox for trunk/src/VBox/Devices/Storage/testcase

Timestamp:

Oct 15, 2008 6:07:59 PM (16 years ago)

Author:

vboxsync

Message:

#3230: Fixed memory leaks in VMDK, tstVD and VBoxHDD-new.

File:

• trunk/src/VBox/Devices/Storage/testcase/tstVD.cpp (modified) (20 diffs)

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

@@ -32 +32 @@
 #include "stdlib.h"
 
+#define VHD_TEST
+#define VDI_TEST
+#define VMDK_TEST
+
 /*******************************************************************************
 *   Global Variables                                                           *
@@ -67 +71 @@
         if (VBOX_FAILURE(rc)) \
         { \
-            VDCloseAll(pVD); \
+            VDDestroy(pVD); \
             return rc; \
         } \
@@ -103 +107 @@
     }
 
+    VDDestroy(pVD);
 #undef CHECK
     return 0;
@@ -123 +128 @@
         if (VBOX_FAILURE(rc)) \
         { \
-            VDCloseAll(pVD); \
+            VDDestroy(pVD); \
             return rc; \
         } \
@@ -154 +159 @@
     }
 
+    VDDestroy(pVD);
 #undef CHECK
     return 0;
@@ -505 +511 @@
         if (VBOX_FAILURE(rc)) \
         { \
-            VDCloseAll(pVD); \
+            if (pvBuf) \
+                RTMemFree(pvBuf); \
+            VDDestroy(pVD); \
             return rc; \
         } \
     } while (0)
+
+    void *pvBuf = RTMemAlloc(_1M);
 
     /* Create error interface. */
@@ -558 +568 @@
     PSEGMENT paMergeSegments = (PSEGMENT)RTMemAllocZ(sizeof(struct Segment) * (nSegments + 1) * 3);
 
-    void *pvBuf = RTMemAlloc(_1M);
-
     RNDCTX ctx;
     initializeRandomGenerator(&ctx, u32Seed);
@@ -600 +608 @@
     VDDumpImages(pVD);
 
-    VDCloseAll(pVD);
+    VDDestroy(pVD);
+    if (pvBuf)
+        RTMemFree(pvBuf);
 #undef CHECK
     return 0;
@@ -625 +635 @@
         if (VBOX_FAILURE(rc)) \
         { \
-            VDCloseAll(pVD); \
+            VDDestroy(pVD); \
             return rc; \
         } \
@@ -681 +691 @@
     RTMemFree(paSegments);
 
-    VDCloseAll(pVD);
+    VDDestroy(pVD);
 #undef CHECK
     return 0;
@@ -700 +710 @@
         if (VBOX_FAILURE(rc)) \
         { \
-            VDCloseAll(pVD); \
+            VDDestroy(pVD); \
             return rc; \
         } \
@@ -722 +732 @@
     CHECK("VDCopy()");
 
-    VDCloseAll(pVD);
+    VDDestroy(pVD);
 #undef CHECK
     return 0;
@@ -884 +894 @@
     }
 
+#ifdef VMDK_TEST
     rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
@@ -906 +917 @@
         g_cErrors++;
     }
-#if 1
+
     tstVmdk();
-#endif
-#if 1
+#endif /* VMDK_TEST */
+#ifdef VDI_TEST
     rc = tstVDCreateDelete("VDI", "tmpVDCreate.vdi", 2 * _4G,
                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
@@ -926 +937 @@
         g_cErrors++;
     }
-#endif
+#endif /* VDI_TEST */
+#ifdef VMDK_TEST
     rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
@@ -959 +971 @@
         g_cErrors++;
     }
-#if 1
+#endif /* VMDK_TEST */
+#ifdef VHD_TEST
     rc = tstVDCreateDelete("VHD", "tmpVDCreate.vhd", 2 * _4G,
                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
@@ -976 +989 @@
         g_cErrors++;
     }
-
+#endif /* VHD_TEST */
+#ifdef VDI_TEST
     rc = tstVDOpenCreateWriteMerge("VDI", "tmpVDBase.vdi", "tmpVDDiff.vdi", u32Seed);
     if (VBOX_FAILURE(rc))
@@ -989 +1003 @@
         g_cErrors++;
     }
+#endif /* VDI_TEST */
+#ifdef VMDK_TEST
     rc = tstVDOpenCreateWriteMerge("VMDK", "tmpVDBase.vmdk", "tmpVDDiff.vmdk", u32Seed);
     if (VBOX_FAILURE(rc))
@@ -1001 +1017 @@
         g_cErrors++;
     }
-
+#endif /* VMDK_TEST */
+#ifdef VHD_TEST
     rc = tstVDCreateWriteOpenRead("VHD", "tmpVDCreate.vhd", u32Seed);
     if (VBOX_FAILURE(rc))
@@ -1015 +1032 @@
         g_cErrors++;
     }
-#endif
+#endif /* VHD_TEST */
 
     /*