Changeset 93690 in vbox for trunk/src/VBox

Timestamp:

Feb 11, 2022 10:10:11 AM (3 years ago)

Author:

vboxsync

Message:

IPRT/avl: Added some height assertions.

Location:

trunk/src/VBox/Runtime/common/table

Files:

• avl_Base.cpp.h (modified) (2 diffs)
• avl_DoWithAll.cpp.h (modified) (2 diffs)

trunk/src/VBox/Runtime/common/table/avl_Base.cpp.h

@@ -320 +320 @@
         else
             break;
+        Assert(pCurNode->uchHeight == RT_MAX(AVL_HEIGHTOF(KAVL_GET_POINTER_NULL(&pCurNode->pLeft)),
+                                             AVL_HEIGHTOF(KAVL_GET_POINTER_NULL(&pCurNode->pRight))) + 1);
 
         kASSERT(AVLStack.cEntries < KAVL_MAX_STACK);
@@ -411 +413 @@
         else
             return NULL;
+        Assert(pDeleteNode->uchHeight == RT_MAX(AVL_HEIGHTOF(KAVL_GET_POINTER_NULL(&pDeleteNode->pLeft)),
+                                                AVL_HEIGHTOF(KAVL_GET_POINTER_NULL(&pDeleteNode->pRight))) + 1);
 
         kASSERT(AVLStack.cEntries < KAVL_MAX_STACK);

trunk/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h

@@ -72 +72 @@
 
             /* center */
+            Assert(pNode->uchHeight == RT_MAX(AVL_HEIGHTOF(KAVL_GET_POINTER_NULL(&pNode->pLeft)),
+                                              AVL_HEIGHTOF(KAVL_GET_POINTER_NULL(&pNode->pRight))) + 1);
             rc = pfnCallBack(pNode, pvParam);
             if (rc != VINF_SUCCESS)
@@ -112 +114 @@
 
             /* center */
+            Assert(pNode->uchHeight == RT_MAX(AVL_HEIGHTOF(KAVL_GET_POINTER_NULL(&pNode->pLeft)),
+                                              AVL_HEIGHTOF(KAVL_GET_POINTER_NULL(&pNode->pRight))) + 1);
             rc = pfnCallBack(pNode, pvParam);
             if (rc != VINF_SUCCESS)