From: Igor Putovny <igor.putovny@nic.cz>
Date: Thu, 21 Sep 2023 11:33:17 +0000 (+0200)
Subject: Extend remove_node() with deleting root node
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c164515fb6a1e69a49c47402ebeb906be6443b23;p=thirdparty%2Fbird.git

Extend remove_node() with deleting root node
---

diff --git a/proto/aggregator/aggregator.c b/proto/aggregator/aggregator.c
index 2065f9510..d0b8124ef 100644
--- a/proto/aggregator/aggregator.c
+++ b/proto/aggregator/aggregator.c
@@ -95,9 +95,11 @@ static void
 remove_node(struct trie_node *node)
 {
   assert(node != NULL);
-  assert(node->parent != NULL);
   assert(node->child[0] == NULL && node->child[1] == NULL);
 
+  if (node->parent == NULL)
+    goto free_node;
+
   if (node->parent->child[0] == node)
     node->parent->child[0] = NULL;
   else if (node->parent->child[1] == node)
@@ -105,7 +107,8 @@ remove_node(struct trie_node *node)
   else
     bug("Invalid child pointer");
 
-  sl_free(node);
+  free_node:
+    sl_free(node);
 }
 
 static void