Changeset 33975 in vbox

Timestamp:

Nov 11, 2010 11:14:54 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67637

Message:

free fix

File:

• trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -369 +369 @@
      */
     rtVfsObjWriteLock(pThis);           /* paranoia */
+    void *pvToFree;
     switch (enmType)
     {
         case RTVFSOBJTYPE_BASE:
+            pvToFree = pThis;
             break;
 
         case RTVFSOBJTYPE_VFS:
+            pvToFree         = RT_FROM_MEMBER(pThis, RTVFSINTERNAL, Base);
             ASMAtomicWriteU32(&RT_FROM_MEMBER(pThis, RTVFSINTERNAL, Base)->uMagic, RTVFS_MAGIC_DEAD);
             break;
 
         case RTVFSOBJTYPE_FS_STREAM:
+            pvToFree         = RT_FROM_MEMBER(pThis, RTVFSFSSTREAMINTERNAL, Base);
             ASMAtomicWriteU32(&RT_FROM_MEMBER(pThis, RTVFSFSSTREAMINTERNAL, Base)->uMagic, RTVFSFSSTREAM_MAGIC_DEAD);
             break;
 
         case RTVFSOBJTYPE_IO_STREAM:
+            pvToFree         = RT_FROM_MEMBER(pThis, RTVFSIOSTREAMINTERNAL, Base);
             ASMAtomicWriteU32(&RT_FROM_MEMBER(pThis, RTVFSIOSTREAMINTERNAL, Base)->uMagic, RTVFSIOSTREAM_MAGIC_DEAD);
             break;
 
         case RTVFSOBJTYPE_DIR:
+            pvToFree         = RT_FROM_MEMBER(pThis, RTVFSDIRINTERNAL, Base);
             ASMAtomicWriteU32(&RT_FROM_MEMBER(pThis, RTVFSDIRINTERNAL, Base)->uMagic, RTVFSDIR_MAGIC_DEAD);
             break;
 
         case RTVFSOBJTYPE_FILE:
+            pvToFree         = RT_FROM_MEMBER(pThis, RTVFSFILEINTERNAL, Stream.Base);
+            ASMAtomicWriteU32(&RT_FROM_MEMBER(pThis, RTVFSFILEINTERNAL, Stream.Base)->uMagic, RTVFSFILE_MAGIC_DEAD);
             ASMAtomicWriteU32(&RT_FROM_MEMBER(pThis, RTVFSIOSTREAMINTERNAL, Base)->uMagic, RTVFSIOSTREAM_MAGIC_DEAD);
-            ASMAtomicWriteU32(&RT_FROM_MEMBER(pThis, RTVFSFILEINTERNAL, Stream.Base)->uMagic, RTVFSFILE_MAGIC_DEAD);
             break;
 
         case RTVFSOBJTYPE_SYMLINK:
+            pvToFree         = RT_FROM_MEMBER(pThis, RTVFSSYMLINKINTERNAL, Base);
             ASMAtomicWriteU32(&RT_FROM_MEMBER(pThis, RTVFSSYMLINKINTERNAL, Base)->uMagic, RTVFSSYMLINK_MAGIC_DEAD);
             break;
@@ -414 +422 @@
     int rc = pThis->pOps->pfnClose(pThis->pvThis);
     AssertRC(rc);
-    RTMemFree(pThis);
+    RTMemFree(pvToFree);
 }