aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-02-02 15:07:36 -05:00
Code

add guards for NULL dereference

Browse Source 
svn path=/icecast/trunk/avl/; revision=13799
This commit is contained in:
Karl Heyes 2007-09-14 03:09:32 +00:00
parent e99eee6c80
commit 7735a94ee6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/avl/avl.c
View File

@ -822,14 +822,14 @@ avl_get_span_by_key (avl_tree * tree,
/* search left */ /* search left */
left = avl_get_prev (node); left = avl_get_prev (node);
i = m; i = m;
while ((i > 0) && (tree->compare_fun (tree->compare_arg, key, left->key) == 0)) { while (left && (i > 0) && (tree->compare_fun (tree->compare_arg, key, left->key) == 0)) {
left = avl_get_prev (left); left = avl_get_prev (left);
i = i - 1; i = i - 1;
} }
/* search right */ /* search right */
right = avl_get_next (node); right = avl_get_next (node);
j = m; j = m;
while ((j <= tree->length) && (tree->compare_fun (tree->compare_arg, key, right->key) == 0)) { while (right && (j <= tree->length) && (tree->compare_fun (tree->compare_arg, key, right->key) == 0)) {
right = avl_get_next (right); right = avl_get_next (right);
j = j + 1; j = j + 1;
} }
@ -870,7 +870,7 @@ avl_get_span_by_two_keys (avl_tree * tree,
avl_node * left; avl_node * left;
/* search left */ /* search left */
left = avl_get_prev (low_node); left = avl_get_prev (low_node);
while ((i > 0) && (tree->compare_fun (tree->compare_arg, low_key, left->key) == 0)) { while (left && (i > 0) && (tree->compare_fun (tree->compare_arg, low_key, left->key) == 0)) {
left = avl_get_prev (left); left = avl_get_prev (left);
i = i - 1; i = i - 1;
} }
@ -881,7 +881,7 @@ avl_get_span_by_two_keys (avl_tree * tree,
avl_node * right; avl_node * right;
/* search right */ /* search right */
right = avl_get_next (high_node); right = avl_get_next (high_node);
while ((j <= tree->length) && (tree->compare_fun (tree->compare_arg, high_key, right->key) == 0)) { while (right && (j <= tree->length) && (tree->compare_fun (tree->compare_arg, high_key, right->key) == 0)) {
right = avl_get_next (right); right = avl_get_next (right);
j = j + 1; j = j + 1;
} }