Final fix for previous commit

FreeRADIUS · May 3, 2014 · 6c9481b · 6c9481b
1 parent 418a464
commit 6c9481b
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/lib/rbtree.c b/src/lib/rbtree.c
@@ -337,6 +337,8 @@ static void delete_fixup(rbtree_t *tree, rbnode_t *x, rbnode_t *parent)
 {
 
 	while (x != tree->root && x->colour == BLACK) {
+		if (!parent) _exit(1);
+
 		if (x == parent->left) {
 			rbnode_t *w = parent->right;
 			if (w->colour == RED) {
@@ -430,7 +432,7 @@ static void rbtree_delete_internal(rbtree_t *tree, rbnode_t *z, bool skiplock)
 	parent = y->parent;
 	if (x != NIL) x->parent = parent;
 
-	if (parent != NIL) {
+	if (parent) {
 		if (y == parent->left) {
 			parent->left = x;
 		} else {
@@ -472,8 +474,11 @@ static void rbtree_delete_internal(rbtree_t *tree, rbnode_t *z, bool skiplock)
 	} else {
 		if (tree->free) tree->free(y->data);
 
-		if (y->colour == BLACK)
-			delete_fixup(tree, x, parent);
+		if (y->colour == BLACK) {
+			if (parent) {
+				delete_fixup(tree, x, parent);
+			} /* tree->root == x, and no fixup is necessary */
+		}
 
 		talloc_free(y);
 	}