Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-11 15:04:23 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix uninitialized memory and NULL-ptr deref in new rbtree

Browse Source
This commit is contained in:
condret 2021-10-20 14:12:58 +02:00
parent 082ded9571
commit ff1256b083
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libr/util/new_rbtree.c
View File

@ -149,7 +149,8 @@ R_API bool r_crbtree_insert(RRBTree *tree, void *data, RRBComparator cmp, void *
goto out_exit;
}
RRBNode head = { .red = 0 }; /* Fake tree root */
RRBNode head; /* Fake tree root */
memset (&head, 0, sizeof (RRBNode));
RRBNode *g = NULL, *parent = &head; /* Grandparent & parent */
RRBNode *p = NULL, *q = tree->root; /* Iterator & parent */
int dir = 0, last = 0; /* Directions */
@ -218,7 +219,8 @@ out_exit:
R_API bool r_crbtree_delete(RRBTree *tree, void *data, RRBComparator cmp, void *user) {
r_return_val_if_fail (tree && data && tree->size && tree->root && cmp, false);
RRBNode head = { .red = 0 };
RRBNode head; /* Fake tree root */
memset (&head, 0, sizeof (RRBNode));
RRBNode *q = &head, *p = NULL, *g = NULL;
RRBNode *found = NULL;
int dir = 1, last;
@ -285,6 +287,7 @@ R_API bool r_crbtree_delete(RRBTree *tree, void *data, RRBComparator cmp, void *
tree->root = head.link[1];
if (tree->root) {
tree->root->red = 0;
tree->root->parent = NULL;
} else {
r_return_val_if_fail (tree->size == 0, false);
}
@ -327,12 +330,9 @@ R_API RRBNode *r_rbnode_next(RRBNode *node) {
return node;
}
RRBNode *parent = node->parent;
while (parent->link[1] == node) {
while (parent && parent->link[1] == node) {
node = parent;
parent = node->parent;
if (!parent) {
return NULL;
}
}
return parent;
}
@ -347,12 +347,9 @@ R_API RRBNode *r_rbnode_prev(RRBNode *node) {
return node;
}
RRBNode *parent = node->parent;
while (parent->link[0] == node) {
while (parent && parent->link[0] == node) {
node = parent;
parent = node->parent;
if (!parent) {
return NULL;
}
}
return parent;
}