Changeset 3839 in vbox

Timestamp:

Jul 25, 2007 3:14:15 PM (18 years ago)

Author:

vboxsync

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

23191

Message:

Extra checks

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp

@@ -391 +391 @@
 
     if (VBOX_FAILURE(rc))
-    {
         return NULL;
-    }
 
     dumpheap ("pre alloc");
@@ -492 +490 @@
 {
     RTCCPHYS physAddr = 0;
-
     VBGLPHYSHEAPBLOCK *pBlock = vbglPhysHeapData2Block (p);
 
@@ -500 +497 @@
                          ("pBlock = %p, pBlock->fu32Flags = %08X\n", pBlock, pBlock->fu32Flags));
 
-        physAddr = pBlock->pChunk->physAddr + ((char *)p - (char *)pBlock->pChunk);
+        if (pBlock->fu32Flags & VBGL_PH_BF_ALLOCATED)
+            physAddr = pBlock->pChunk->physAddr + ((char *)p - (char *)pBlock->pChunk);
     }
 
@@ -510 +508 @@
     VBGLPHYSHEAPBLOCK *pBlock;
     VBGLPHYSHEAPBLOCK *pNeighbour;
+
     int rc = vbglPhysHeapEnter ();
-
     if (VBOX_FAILURE(rc))
-    {
         return;
-    }
 
     dumpheap ("pre free");
@@ -523 +519 @@
     if (!pBlock)
     {
+        vbglPhysHeapLeave ();
         return;
     }
@@ -612 +609 @@
 
     if (!pBlock)
-    {
         rc = VERR_NO_MEMORY;
-    }
 
     RTSemFastMutexCreate(&g_vbgldata.mutexHeap);