Changeset 15677 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 19, 2008 9:26:23 AM (16 years ago)

Author:

vboxsync

Message:

Don't touch freed memory. Added some more error checks.

File:

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

trunk/src/VBox/VMM/PATM/PATM.cpp

@@ -5844 +5844 @@
         if (    RT_FAILURE(rc)
             ||  !(CpuOld.pCurInstr->optype & OPTYPE_HARMLESS))
+        {
+            if (RT_SUCCESS(rc))
+                cbDirty += CpuOld.opsize;
+            else
+            if (!cbDirty)
+                cbDirty = 1;
             break;
+        }
 
 #ifdef DEBUG
@@ -5852 +5859 @@
         Log(("DIRTY: %s\n", szBuf));
 #endif
+        /* Mark as clean; if we fail we'll let it always fault. */
+        pRec->fDirty      = false;
+
         /** Remove old lookup record. */
         patmr3RemoveP2GLookupRecord(pVM, &pPatch->patch, pCurPatchInstrGC);
@@ -5857 +5867 @@
         pCurPatchInstrGC += CpuOld.opsize;
         cbDirty          += CpuOld.opsize;
-
-        /* Mark as clean; if we fail we'll let it always fault. */
-        pRec->fDirty      = false;
 
         /* Let's see if there's another dirty instruction right after. */
@@ -5953 +5960 @@
     {
         STAM_COUNTER_INC(&pVM->patm.s.StatInstrDirtyBad);
+        Assert(cbDirty);
+
         /* Mark the whole instruction stream with breakpoints. */
-        memset(pPatchInstrHC, 0xCC, cbDirty);
+        if (cbDirty)
+            memset(pPatchInstrHC, 0xCC, cbDirty);
 
         if (    pVM->patm.s.fOutOfMemory == false