X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsplay_tree.c;h=54a46f28f6d56468fdc876e08a759cd0bd3fac6b;hb=1be7dc759a64d436fd7586aad43b545f2dc665b5;hp=166e5ee68f1405dd96b37566ad9e2b5d41805dd9;hpb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;p=tinc

diff --git a/src/splay_tree.c b/src/splay_tree.c
index 166e5ee6..54a46f28 100644
--- a/src/splay_tree.c
+++ b/src/splay_tree.c
@@ -1,6 +1,6 @@
 /*
     splay_tree.c -- splay tree and linked list convenience
-    Copyright (C) 2004-2006 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2004-2012 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -398,6 +398,8 @@ splay_node_t *splay_insert_node(splay_tree_t *tree, splay_node_t *node) {
 	splay_node_t *closest;
 	int result;
 
+	node->left = node->right = node->parent = node->next = node->prev = NULL;
+
 	if(!tree->root)
 		splay_insert_top(tree, node);
 	else {
@@ -418,6 +420,7 @@ splay_node_t *splay_insert_node(splay_tree_t *tree, splay_node_t *node) {
 void splay_insert_top(splay_tree_t *tree, splay_node_t *node) {
 	node->prev = node->next = node->left = node->right = node->parent = NULL;
 	tree->head = tree->tail = tree->root = node;
+	tree->count++;
 }
 
 void splay_insert_before(splay_tree_t *tree, splay_node_t *before, splay_node_t *node) {
@@ -446,6 +449,7 @@ void splay_insert_before(splay_tree_t *tree, splay_node_t *before, splay_node_t
 
 	node->parent = NULL;
 	tree->root = node;
+	tree->count++;
 }
 
 void splay_insert_after(splay_tree_t *tree, splay_node_t *after, splay_node_t *node) {
@@ -474,6 +478,7 @@ void splay_insert_after(splay_tree_t *tree, splay_node_t *after, splay_node_t *n
 
 	node->parent = NULL;
 	tree->root = node;
+	tree->count++;
 }
 
 splay_node_t *splay_unlink(splay_tree_t *tree, void *data) {
@@ -511,6 +516,8 @@ void splay_unlink_node(splay_tree_t *tree, splay_node_t *node) {
 	} else {
 		tree->root = NULL;
 	}
+
+	tree->count--;
 }
 
 void splay_delete_node(splay_tree_t *tree, splay_node_t *node) {