X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Frbtree.c;h=ff86b0f1b5b958ce65130c86dc66d51b436792a7;hb=a316744bc5e003d0fa4c8aff82c619b300115f02;hp=df759cb2344ce53cff3e018e535a8dfa4bcfd191;hpb=badf38a2b7559a313fda01811f86a9c25f4c00db;p=vpp.git

diff --git a/src/vppinfra/rbtree.c b/src/vppinfra/rbtree.c
index df759cb2344..ff86b0f1b5b 100644
--- a/src/vppinfra/rbtree.c
+++ b/src/vppinfra/rbtree.c
@@ -344,7 +344,7 @@ rb_tree_del_node (rb_tree_t * rt, rb_node_t * z)
 	x->parent = yi;
       else
 	{
-	  rb_tree_transplant (rt, y, rb_node_right (rt, y));
+	  rb_tree_transplant (rt, y, x);
 	  y->right = z->right;
 	  yr = rb_node_right (rt, y);
 	  yr->parent = yi;
@@ -379,7 +379,8 @@ rb_tree_del_node (rb_tree_t * rt, rb_node_t * z)
 	  wr = rb_node_right (rt, w);
 	  if (wl->color == RBTREE_BLACK && wr->color == RBTREE_BLACK)
 	    {
-	      w->color = RBTREE_RED;
+	      if (!rb_node_is_tnil (rt, w))
+		w->color = RBTREE_RED;
 	      x = xp;
 	    }
 	  else
@@ -390,6 +391,7 @@ rb_tree_del_node (rb_tree_t * rt, rb_node_t * z)
 		  w->color = RBTREE_RED;
 		  rb_tree_rotate_right (rt, w);
 		  w = rb_node_right (rt, xp);
+		  wr = rb_node_right (rt, w);
 		}
 	      w->color = xp->color;
 	      xp->color = RBTREE_BLACK;
@@ -412,7 +414,8 @@ rb_tree_del_node (rb_tree_t * rt, rb_node_t * z)
 	  wr = rb_node_right (rt, w);
 	  if (wl->color == RBTREE_BLACK && wr->color == RBTREE_BLACK)
 	    {
-	      w->color = RBTREE_RED;
+	      if (!rb_node_is_tnil (rt, w))
+		w->color = RBTREE_RED;
 	      x = xp;
 	    }
 	  else
@@ -423,6 +426,7 @@ rb_tree_del_node (rb_tree_t * rt, rb_node_t * z)
 		  w->color = RBTREE_RED;
 		  rb_tree_rotate_left (rt, w);
 		  w = rb_node_left (rt, xp);
+		  wl = rb_node_left (rt, w);
 		}
 	      w->color = xp->color;
 	      xp->color = RBTREE_BLACK;