fix sonarqube issues

rtbrick · Nov 28, 2024 · cee644a · cee644a
1 parent ff0cc88
commit cee644a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/pr_tree.c b/src/pr_tree.c
@@ -466,10 +466,10 @@ node_verify(const pr_tree* tree, const pr_node* parent, const pr_node* node)
         unsigned lweight = WEIGHT(l);
         unsigned rweight = WEIGHT(r);
         VERIFY(node->weight == lweight + rweight);
-        if (rweight > lweight) {
+        if (r && rweight > lweight) {
             VERIFY(WEIGHT(r->rlink) <= lweight);
             VERIFY(WEIGHT(r->llink) <= lweight);
-        } else if (lweight > rweight) {
+        } else if (l && lweight > rweight) {
             VERIFY(WEIGHT(l->llink) <= rweight);
             VERIFY(WEIGHT(l->rlink) <= rweight);
         }

diff --git a/src/skiplist.c b/src/skiplist.c
@@ -169,7 +169,7 @@ node_insert(skiplist* list, skip_node* x, skip_node** update)
     }
 
     x->prev = (update[0] == list->head) ? NULL : update[0];
-    if (update[0]->link[0])
+    if (update[0]->link && update[0]->link[0])
         update[0]->link[0]->prev = x;
     for (unsigned k = 0; k < nlinks; k++) {
         ASSERT(update[k]->link_count > k);

diff --git a/src/tree_common.c b/src/tree_common.c
@@ -401,14 +401,22 @@ bool
 tree_iterator_next(void* Iterator)
 {
     tree_iterator* iterator = Iterator;
-    return (iterator->node != NULL) && (iterator->node = tree_node_next(iterator->node)) != NULL;
+    if(iterator->node) {
+        iterator->node = tree_node_next(iterator->node);
+        if(iterator->node) return true;
+    }
+    return false;
 }
 
 bool
 tree_iterator_prev(void* Iterator)
 {
     tree_iterator* iterator = Iterator;
-    return (iterator->node != NULL) && (iterator->node = tree_node_prev(iterator->node)) != NULL;
+    if(iterator->node) {
+        iterator->node = tree_node_prev(iterator->node);
+        if(iterator->node) return true;
+    }
+    return false;
 }
 
 bool