michaelh/zephyr
1
0
Fork 0
Code Releases Activity

lib/rbtree: Remove dead case in rb_remove()

Browse source 
This "else" clause was dead code, in a valid
tree it's not possible to have a node and
its child both be red.
Fix issue #33239.

Signed-off-by: Ningx Zhao <ningx.zhao@intel.com>
This commit is contained in:
Ningx Zhao 2021-03-11 21:05:40 +08:00 • committed by Anas Nashif
commit 7874052df2
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/os/rb.c
View file

@ -478,14 +478,11 @@ void rb_remove(struct rbtree *tree, struct rbnode *node)
set_child(parent, get_side(parent, node), child); set_child(parent, get_side(parent, node), child);
/* Check colors, if one was red (at least one must have been /* Check colors, if one was red (at least one must have been
* black in a valid tree), then we're done. Otherwise we have * black in a valid tree), then we're done.
* a missing black we need to fix
*/ */
__ASSERT(is_black(node) || is_black(child), "both nodes red?!");
if (is_red(node) || is_red(child)) { if (is_red(node) || is_red(child)) {
set_color(child, BLACK); set_color(child, BLACK);
} else {
stack[stacksz - 1] = child;
fix_missing_black(stack, stacksz, NULL);
} }
} }