Merge branch 'master' into evpn-bug-fixes

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/ns.c b/lib/ns.c
index fdf93d0742..0b2a3bec78 100644
--- a/lib/ns.c
+++ b/lib/ns.c
@@ -424,8 +424,11 @@ void ns_terminate(void)
 {
 	struct ns *ns;
 
-	while ((ns = RB_ROOT(ns_head, &ns_tree)) != NULL)
+	while (!RB_EMPTY(ns_head, &ns_tree)) {
+		ns = RB_ROOT(ns_head, &ns_tree);
+
 		ns_delete(ns);
+	}
 }
 
 /* Create a socket for the NS. */