j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Fix memory leak in avl_insert() if item was already inserted.

Browse source
This commit is contained in:
Guus Sliepen 2001-02-06 10:13:22 +00:00
parent f777c1807d
commit 4bc394a3e2
2 changed files with 40 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/avl_tree.c
View file

@ -26,10 +26,10 @@
the code. Mail me if you found a bug. the code. Mail me if you found a bug.
Cleaned up and incorporated some of the ideas from the red-black tree Cleaned up and incorporated some of the ideas from the red-black tree
library for inclusion into tinc (http://tinc.nl.linux.org) by library for inclusion into tinc (http://tinc.nl.linux.org/) by
Guus Sliepen <guus@sliepen.warande.net>. Guus Sliepen <guus@sliepen.warande.net>.
$Id: avl_tree.c,v 1.1.2.4 2001/01/08 21:32:00 guus Exp $ $Id: avl_tree.c,v 1.1.2.5 2001/02/06 10:13:21 guus Exp $
*/ */
#include <stdio.h> #include <stdio.h>
@ -406,12 +406,43 @@ avl_node_t *avl_search_closest_greater_node(const avl_tree_t *tree, const void *
avl_node_t *avl_insert(avl_tree_t *tree, void *data) avl_node_t *avl_insert(avl_tree_t *tree, void *data)
{ {
avl_node_t *node; avl_node_t *closest, *new;
int result;
node = avl_alloc_node(); if (!tree->root)
node->data = data; {
new = avl_alloc_node();
new->data = data;
avl_insert_top(tree, new);
}
else
{
closest = avl_search_closest_node(tree, data, &result);
switch(result)
{
case -1:
new = avl_alloc_node();
new->data = data;
avl_insert_before(tree, closest, new);
break;
case 1:
new = avl_alloc_node();
new->data = data;
avl_insert_after(tree, closest, new);
break;
case 0:
return NULL;
}
}
return avl_insert_node(tree, node); #ifdef AVL_COUNT
new->count = 1;
#endif
#ifdef AVL_DEPTH
new->depth = 1;
#endif
return new;
} }
avl_node_t *avl_insert_node(avl_tree_t *tree, avl_node_t *node) avl_node_t *avl_insert_node(avl_tree_t *tree, avl_node_t *node)
@ -433,7 +464,7 @@ avl_node_t *avl_insert_node(avl_tree_t *tree, avl_node_t *node)
avl_insert_after(tree, closest, node); avl_insert_after(tree, closest, node);
break; break;
case 0: case 0:
return closest; return NULL;
} }
} }

4
lib/avl_tree.h
View file

@ -26,10 +26,10 @@
the code. Mail me if you found a bug. the code. Mail me if you found a bug.
Cleaned up and incorporated some of the ideas from the red-black tree Cleaned up and incorporated some of the ideas from the red-black tree
library for inclusion into tinc (http://tinc.nl.linux.org) by library for inclusion into tinc (http://tinc.nl.linux.org/) by
Guus Sliepen <guus@sliepen.warande.net>. Guus Sliepen <guus@sliepen.warande.net>.
$Id: avl_tree.h,v 1.1.2.3 2001/01/07 17:08:49 guus Exp $ $Id: avl_tree.h,v 1.1.2.4 2001/02/06 10:13:22 guus Exp $
*/ */