Changeset 33478 in vbox for trunk/src

Timestamp:

Oct 26, 2010 8:56:38 PM (14 years ago)

Author:

vboxsync

Message:

Devices/Storage: a number of small memory leaks in error paths

Location:

trunk/src/VBox/Devices/Storage

Files:

• VDIHDDCore.cpp (modified) (1 diff)
• VHDHDDCore.cpp (modified) (2 diffs)
• VmdkHDDCore.cpp (modified) (3 diffs)

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

@@ -711 +711 @@
             {
                 rc = vdiError(pImage, rc, RT_SRC_POS, N_("VDI: writing block failed for '%s'"), pImage->pszFilename);
+                RTMemTmpFree(pvBuf);
                 goto out;
             }

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

@@ -922 +922 @@
     pImage->pBlockAllocationTable = (uint32_t *)RTMemAllocZ(pImage->cBlockAllocationTableEntries * sizeof(uint32_t));
     if (!pImage->pBlockAllocationTable)
+    {
+        RTMemFree(pBlockAllocationTable);
         return VERR_NO_MEMORY;
+    }
 
     for (i = 0; i < pImage->cBlockAllocationTableEntries; i++)
@@ -1517 +1520 @@
     /* Get I/O interface. */
     pImage->pInterfaceIO = VDInterfaceGet(pImage->pVDIfsImage, VDINTERFACETYPE_IOINT);
-    AssertPtrReturn(pImage->pInterfaceIO, VERR_INVALID_PARAMETER);
+    if (RT_UNLIKELY(!VALID_PTR(pImage->pInterfaceIO)))
+    {
+        RTMemFree(pImage);
+        return VERR_INVALID_PARAMETER;
+    }
     pImage->pInterfaceIOCallbacks = VDGetInterfaceIOInt(pImage->pInterfaceIO);
-    AssertPtrReturn(pImage->pInterfaceIOCallbacks, VERR_INVALID_PARAMETER);
+    if (RT_UNLIKELY(!VALID_PTR(pImage->pInterfaceIOCallbacks)))
+    {
+        RTMemFree(pImage);
+        return VERR_INVALID_PARAMETER;
+    }
 
     rc = vhdCreateImage(pImage, cbSize, uImageFlags, pszComment,

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

@@ -3199 +3199 @@
     int rc = VINF_SUCCESS;
     PVMDKEXTENT pExtents = (PVMDKEXTENT)RTMemAllocZ(cExtents * sizeof(VMDKEXTENT));
-    if (pImage)
+    if (pExtents)
     {
         for (unsigned i = 0; i < cExtents; i++)
@@ -5400 +5400 @@
     uGDIndex = uSector / pExtent->cSectorsPerGDE;
     if (uGDIndex >= pExtent->cGDEntries)
+    {
+        RTMemFree(pGrainAlloc);
         return VERR_OUT_OF_RANGE;
+    }
     uGTSector = pExtent->pGD[uGDIndex];
     if (pExtent->pRGD)
@@ -5900 +5903 @@
     if (!pImage->pDescData)
     {
+        RTMemFree(pImage);
         rc = VERR_NO_MEMORY;
         goto out;