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

Timestamp:

Jun 7, 2013 7:41:24 PM (12 years ago)

Author:

vboxsync

Message:

STAM: Fixed bug in stamR3LookupDestroyTree.

File:

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

trunk/src/VBox/VMM/VMMR3/STAM.cpp

@@ -1165 +1165 @@
 {
     Assert(pRoot); Assert(!pRoot->pParent);
-    PSTAMLOOKUP pLookup = pRoot;
+    PSTAMLOOKUP pCur = pRoot;
     for (;;)
     {
-        uint32_t i = pLookup->cChildren;
+        uint32_t i = pCur->cChildren;
         if (i > 0)
         {
@@ -1174 +1174 @@
              * Push child (with leaf optimization).
              */
-            PSTAMLOOKUP pChild = pLookup->papChildren[--i];
+            PSTAMLOOKUP pChild = pCur->papChildren[--i];
             if (pChild->cChildren != 0)
-                pLookup = pChild;
+                pCur = pChild;
             else
             {
@@ -1188 +1188 @@
                     }
                     RTMemFree(pChild);
+                    pCur->papChildren[i] = NULL;
 
                     /* next */
                     if (i == 0)
                     {
-                        pLookup->papChildren = 0;
+                        pCur->cChildren = 0;
                         break;
                     }
-                    pChild = pLookup->papChildren[--i];
+                    pChild = pCur->papChildren[--i];
                     if (pChild->cChildren != 0)
                     {
-                        pLookup->cChildren = i + 1;
-                        pLookup = pChild;
+                        pCur->cChildren = i + 1;
+                        pCur = pChild;
                         break;
                     }
@@ -1210 +1211 @@
              * Pop and free current.
              */
-            Assert(!pLookup->pDesc);
-
-            PSTAMLOOKUP pParent = pLookup->pParent;
-            RTMemFree(pLookup->papChildren);
-            pLookup->papChildren = NULL;
-            RTMemFree(pLookup);
-
-            pLookup = pParent;
-            if (!pLookup)
+            Assert(!pCur->pDesc);
+
+            PSTAMLOOKUP pParent = pCur->pParent;
+            Assert(pCur->iParent == (pParent ? pParent->cChildren - 1 : UINT16_MAX));
+
+            RTMemFree(pCur->papChildren);
+            pCur->papChildren = NULL;
+            RTMemFree(pCur);
+
+            pCur = pParent;
+            if (!pCur)
                 break;
-            pLookup->cChildren--;
+            pCur->papChildren[--pCur->cChildren] = NULL;
         }
     }