From b6caccfd45fb639b6dd3a8d140d3c5ba4cc79311 Mon Sep 17 00:00:00 2001 From: Maria Matejka Date: Thu, 19 Dec 2024 11:00:15 +0100 Subject: [PATCH] Kernel: Fix crash for merge paths on if no route is in BIRD There was a missing check for a NULL return value. Also fixed an indenting error. Thanks to Radu Anghel for reporting it: https://bird.network.cz/pipermail/bird-users/2024-December/017977.html --- nest/rt-table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nest/rt-table.c b/nest/rt-table.c index fd8bb50d..05191d74 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -5265,14 +5265,14 @@ krt_export_net(struct channel *c, const net_addr *a, linpool *lp) if (c->ra_mode == RA_MERGED) { struct rt_export_feed *feed = rt_net_feed(c->table, a, NULL); - if (!feed->count_routes) + if (!feed || !feed->count_routes) return NULL; if (!bmap_test(&c->export_accepted_map, feed->block[0].id)) return NULL; return rt_export_merged(c, feed, lp, 1); - } + } static _Thread_local rte best; best = rt_net_best(c->table, a);