X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsplay_tree.c;h=53cf79eceafa107fc42715df380b26e096382f6b;hb=eff41a69e1976fd521b4c524bed86b1bc095b10f;hp=07478f2f7ce35fdd2a3e9ecad1954a0344404189;hpb=1f8b70efa0dedbd3642e0ee82a640d125664af34;p=meshlink

diff --git a/src/splay_tree.c b/src/splay_tree.c
index 07478f2f..53cf79ec 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-2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -238,7 +238,7 @@ static void splay_bottom_up(splay_tree_t *tree, splay_node_t *node) {
 splay_tree_t *splay_alloc_tree(splay_compare_t compare, splay_action_t delete) {
 	splay_tree_t *tree;
 
-	tree = xmalloc_and_zero(sizeof(splay_tree_t));
+	tree = xzalloc(sizeof(splay_tree_t));
 	tree->compare = compare;
 	tree->delete = delete;
 
@@ -250,7 +250,7 @@ void splay_free_tree(splay_tree_t *tree) {
 }
 
 splay_node_t *splay_alloc_node(void) {
-	return xmalloc_and_zero(sizeof(splay_node_t));
+	return xzalloc(sizeof(splay_node_t));
 }
 
 void splay_free_node(splay_tree_t *tree, splay_node_t *node) {
@@ -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 {