util: fix NULL deref in interval tree foreach (#4004)

rizinorg · Nov 27, 2023 · fce44a2 · fce44a2
1 parent c182663
commit fce44a2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/librz/include/rz_util/rz_intervaltree.h b/librz/include/rz_util/rz_intervaltree.h
@@ -93,9 +93,11 @@ static inline bool rz_interval_tree_empty(RzIntervalTree *tree) {
 }
 
 #define rz_interval_tree_foreach(tree, it, dat) \
-	for ((it) = rz_rbtree_first(&(tree)->root->node); rz_rbtree_iter_has(&it) && (dat = rz_interval_tree_iter_get(&it)->data); rz_rbtree_iter_next(&(it)))
+	if ((tree)->root) \
+		for ((it) = rz_rbtree_first(&(tree)->root->node); rz_rbtree_iter_has(&it) && (dat = rz_interval_tree_iter_get(&it)->data); rz_rbtree_iter_next(&(it)))
 
 #define rz_interval_tree_foreach_prev(tree, it, dat) \
-	for ((it) = rz_rbtree_last(&(tree)->root->node); rz_rbtree_iter_has(&it) && (dat = rz_rbtree_iter_get(&it, RzIntervalNode, node)->data); rz_rbtree_iter_prev(&(it)))
+	if ((tree)->root) \
+		for ((it) = rz_rbtree_last(&(tree)->root->node); rz_rbtree_iter_has(&it) && (dat = rz_rbtree_iter_get(&it, RzIntervalNode, node)->data); rz_rbtree_iter_prev(&(it)))
 
 #endif // RZ_INTERVALTREE_H