From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 25 Feb 2021 22:23:45 +0000 (+0000)
Subject: rbtree pointer should never be NULL
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fea4029992dcd4e91e93af78069acce3b1cfc367;p=thirdparty%2Ffreeradius-server.git

rbtree pointer should never be NULL
---

diff --git a/src/lib/util/rbtree.c b/src/lib/util/rbtree.c
index 8e419001256..9211f4ebf35 100644
--- a/src/lib/util/rbtree.c
+++ b/src/lib/util/rbtree.c
@@ -821,8 +821,6 @@ int rbtree_walk(rbtree_t *tree, fr_rb_order_t order, fr_rb_walker_t compare, voi
 
 uint32_t rbtree_num_elements(rbtree_t *tree)
 {
-	if (!tree) return 0;
-
 	return tree->num_elements;
 }
 
diff --git a/src/lib/util/rbtree.h b/src/lib/util/rbtree.h
index 29e054b7f11..18686154b20 100644
--- a/src/lib/util/rbtree.h
+++ b/src/lib/util/rbtree.h
@@ -124,30 +124,29 @@ typedef void (*fr_rb_free_t)(void *data);
 		)
 
 rbtree_t	*_rbtree_alloc(TALLOC_CTX *ctx, size_t offset, char const *type,
-			       fr_rb_cmp_t compare, fr_rb_free_t node_free, int flags);
+			       fr_rb_cmp_t compare, fr_rb_free_t node_free, int flags) CC_HINT(warn_unused_result);
 
-void		rbtree_unlock(rbtree_t *tree);
+void		rbtree_unlock(rbtree_t *tree) CC_HINT(nonnull);
 
-void		rbtree_node_talloc_free(void *data);
+void		rbtree_node_talloc_free(void *data) CC_HINT(nonnull);
 
-bool		rbtree_insert(rbtree_t *tree, void const *data);
+bool		rbtree_insert(rbtree_t *tree, void const *data) CC_HINT(nonnull);
 
-fr_rb_node_t	*rbtree_insert_node(rbtree_t *tree, void *data);
+fr_rb_node_t	*rbtree_insert_node(rbtree_t *tree, void *data) CC_HINT(nonnull);
 
-void		rbtree_delete(rbtree_t *tree, fr_rb_node_t *z);
+void		rbtree_delete(rbtree_t *tree, fr_rb_node_t *z) CC_HINT(nonnull);
 
-bool		rbtree_deletebydata(rbtree_t *tree, void const *data);
+bool		rbtree_deletebydata(rbtree_t *tree, void const *data) CC_HINT(nonnull);
 
-fr_rb_node_t	*rbtree_find(rbtree_t *tree, void const *data);
+fr_rb_node_t	*rbtree_find(rbtree_t *tree, void const *data) CC_HINT(nonnull);
 
 /** @hidecallergraph */
-void		*rbtree_finddata(rbtree_t *tree, void const *data);
+void		*rbtree_finddata(rbtree_t *tree, void const *data) CC_HINT(nonnull);
 
-uint32_t	rbtree_num_elements(rbtree_t *tree);
+uint32_t	rbtree_num_elements(rbtree_t *tree) CC_HINT(nonnull);
 
 uint32_t	rbtree_flatten(TALLOC_CTX *ctx, void **out[], rbtree_t *tree, fr_rb_order_t order);
 
-
 void		*rbtree_node2data(rbtree_t *tree, fr_rb_node_t *node);
 
 /*