Changeset 69967 in vbox

Timestamp:

Dec 7, 2017 10:38:48 AM (7 years ago)

Author:

vboxsync

Message:

IPRT/dvm: Don't leak volume related stuff.

Location:

trunk/src/VBox/Runtime/common/dvm

Files:

• dvm.cpp (modified) (4 diffs)
• dvmvfs.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/dvm/dvm.cpp

@@ -161 +161 @@
  * Destroys a volume handle.
  *
- * @param   pThis               The volume to destroy.
- */
-static void rtDvmVolumeDestroy(PRTDVMVOLUMEINTERNAL pThis)
-{
-    PRTDVMINTERNAL pVolMgr = pThis->pVolMgr;
-
-    AssertPtr(pVolMgr);
+ * @param   pThis   The volume manager instance.
+ * @param   pVol    The volume to destroy.
+ */
+static void rtDvmVolumeDestroy(PRTDVMINTERNAL pThis, PRTDVMVOLUMEINTERNAL pVol)
+{
+    AssertPtr(pThis);
+    AssertPtr(pThis->pDvmFmtOps);
+    Assert(pVol->pVolMgr == pThis);
 
     /* Close the volume. */
-    pVolMgr->pDvmFmtOps->pfnVolumeClose(pThis->hVolFmt);
-
-    pThis->u32Magic = RTDVMVOLUME_MAGIC_DEAD;
-    pThis->pVolMgr  = NULL;
-    pThis->hVolFmt  = NIL_RTDVMVOLUMEFMT;
-    RTMemFree(pThis);
-
-    /* Release the reference of the volume manager. */
-    RTDvmRelease(pVolMgr);
+    pThis->pDvmFmtOps->pfnVolumeClose(pVol->hVolFmt);
+
+    pVol->u32Magic = RTDVMVOLUME_MAGIC_DEAD;
+    pVol->pVolMgr  = NULL;
+    pVol->hVolFmt  = NIL_RTDVMVOLUMEFMT;
+    RTMemFree(pVol);
 }
 
@@ -240 +238 @@
         AssertPtr(pThis->pDvmFmtOps);
 
+        /* */
+        PRTDVMVOLUMEINTERNAL pItNext, pIt;
+        RTListForEachSafe(&pThis->VolumeList, pIt, pItNext, RTDVMVOLUMEINTERNAL, VolumeNode)
+        {
+            RTListNodeRemove(&pIt->VolumeNode);
+            rtDvmVolumeDestroy(pThis, pIt);
+        }
+
         /* Let the backend do it's own cleanup first. */
         pThis->pDvmFmtOps->pfnClose(pThis->hVolMgrFmt);
@@ -253 +259 @@
         pThis->DvmDisk.hVfsFile = NIL_RTVFSFILE;
     }
+
     RTMemFree(pThis);
 }
@@ -354 +361 @@
                 {
                     RTListNodeRemove(&pIt->VolumeNode);
-                    rtDvmVolumeDestroy(pIt);
+                    rtDvmVolumeDestroy(pThis, pIt);
                 }
             }

trunk/src/VBox/Runtime/common/dvm/dvmvfs.cpp

@@ -618 +618 @@
  */
 static DECLCALLBACK(int) rtDvmVfsDir_SetTimes(void *pvThis, PCRTTIMESPEC pAccessTime, PCRTTIMESPEC pModificationTime,
-                                             PCRTTIMESPEC pChangeTime, PCRTTIMESPEC pBirthTime)
+                                              PCRTTIMESPEC pChangeTime, PCRTTIMESPEC pBirthTime)
 {
     NOREF(pvThis); NOREF(pAccessTime); NOREF(pModificationTime); NOREF(pChangeTime); NOREF(pBirthTime);