From: Igor Putovny <igor.putovny@nic.cz>
Date: Fri, 7 Mar 2025 15:36:06 +0000 (+0100)
Subject: Bugfix
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5979b12f0b133fe63d4dfe7a49485ad5fbce9afe;p=thirdparty%2Fbird.git

Bugfix

Set node status to NON_FIB when allocating additional nodes
---

diff --git a/proto/aggregator/trie.c b/proto/aggregator/trie.c
index f2e4c1530..863d7e8fc 100644
--- a/proto/aggregator/trie.c
+++ b/proto/aggregator/trie.c
@@ -551,6 +551,7 @@ static void
 aggregator_second_pass(struct trie_node *node, int recomputing)
 {
   ASSERT_DIE(node != NULL);
+  ASSERT_DIE(node->status != UNASSIGNED_FIB);
   ASSERT_DIE(node->potential_buckets_count <= MAX_POTENTIAL_BUCKETS_COUNT);
 
   if (recomputing)
@@ -637,6 +638,7 @@ static void
 aggregator_third_pass_helper(struct aggregator_proto *p, struct trie_node *node, ip_addr *prefix, u32 pxlen)
 {
   ASSERT_DIE(node != NULL);
+  ASSERT_DIE(node->status != UNASSIGNED_FIB);
   ASSERT_DIE(node->potential_buckets_count <= MAX_POTENTIAL_BUCKETS_COUNT);
 
   ASSERT_DIE(node->original_bucket != NULL);
@@ -716,6 +718,7 @@ aggregator_third_pass_helper(struct aggregator_proto *p, struct trie_node *node,
     struct trie_node imaginary_node = {
       .parent = node,
       .original_bucket = node->original_bucket,
+      .status = NON_FIB,
       .px_origin = AGGREGATED,
       .depth = node->depth + 1,
     };