Changeset 5517 in vbox

Timestamp:

Oct 26, 2007 3:40:47 PM (17 years ago)

Author:

vboxsync

Message:

fixed assertions.

File:

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

trunk/src/VBox/VMM/CFGM.cpp

@@ -771 +771 @@
     RTUUID Uuid;
     RTUuidClear(&Uuid);
-    rc = CFGMR3InsertBytes(pCfg,    "UUID", &Uuid, sizeof(Uuid));                   
+    rc = CFGMR3InsertBytes(pCfg,    "UUID", &Uuid, sizeof(Uuid));
     UPDATERC();
     /* Bios logo. */
@@ -1078 +1078 @@
     if (RT_SUCCESS(rc))
     {
-        Assert(pNewChild->pFirstChild);
+        Assert(!pNewChild->pFirstChild);
         pNewChild->pFirstChild = pSubTree->pFirstChild;
-        Assert(pNewChild->pFirstLeaf);
+        Assert(!pNewChild->pFirstLeaf);
         pNewChild->pFirstLeaf = pSubTree->pFirstLeaf;
         if (ppChild)
@@ -1386 +1386 @@
             if (pNode->pParent)
                 pNode->pParent->pFirstChild = pNode->pNext;
-            else if (pNode == pNode->pVM->cfgm.s.pRoot)
+            else if (pNode == pNode->pVM->cfgm.s.pRoot) /* might be a different tree */
                 pNode->pVM->cfgm.s.pRoot = NULL;
         }
@@ -1400 +1400 @@
         pNode->pParent = NULL;
         MMR3HeapFree(pNode);
-
     }
 }