Changeset 5054 in vbox

Timestamp:

Sep 26, 2007 3:54:23 PM (17 years ago)

Author:

vboxsync

Message:

PGMPhysIsPageMappingLockValid won't work on uninitialized data.

File:

• trunk/src/VBox/VMM/CPUM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/CPUM.cpp

@@ -1516 +1516 @@
     /** The lock information that PGMPhysReleasePageMappingLock needs. */
     PGMPAGEMAPLOCK  PageMapLock;
+    /** Whether the PageMapLock is valid or not. */
+    bool            fLocked;
 } CPUMDISASSTATE, *PCPUMDISASSTATE;
 
@@ -1556 +1558 @@
             {
                 /* Release mapping lock previously acquired. */
-                if (PGMPhysIsPageMappingLockValid(pState->pVM, &pState->PageMapLock))
+                if (pState->fLocked)
                     PGMPhysReleasePageMappingLock(pState->pVM, &pState->PageMapLock);
-
                 rc = PGMPhysGCPtr2CCPtrReadOnly(pState->pVM, pState->pvPageGC, &pState->pvPageHC, &pState->PageMapLock);
+                pState->fLocked = RT_SUCCESS_NP(rc);
             }
             if (VBOX_FAILURE(rc))
@@ -1611 +1613 @@
     State.pvPageHC        = NULL;
     State.pVM             = pVM;
+    State.fLocked         = false;
 
     /*
@@ -1688 +1691 @@
 
     /* Release mapping lock acquired in cpumR3DisasInstrRead. */
-    if (PGMPhysIsPageMappingLockValid(pVM, &State.PageMapLock))
+    if (State.fLocked)
         PGMPhysReleasePageMappingLock(pVM, &State.PageMapLock);