bgpd: Fix crash when we don't have a nexthop

Recent changes to allow bgpd to handle v6 LL slightly
differently in the nexthop tracking code has not
interacted well with the blackhole nexthop change
for peers.  Modify the code to do the right thing

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
index af7302b750fcdabc1440c43e0935e661fe750cbd..2c70d01d46d74115be350500d65e8e5a7ac06041 100644 (file)
--- a/bgpd/bgp_nht.c
+++ b/bgpd/bgp_nht.c
@@ -838,7 +838,7 @@ static void evaluate_paths(struct bgp_nexthop_cache *bnc)
                        /*
                         * Peering cannot occur across a blackhole nexthop
                         */
-                       if (bnc->nexthop_num == 1
+                       if (bnc->nexthop_num == 1 && bnc->nexthop
                            && bnc->nexthop->type == NEXTHOP_TYPE_BLACKHOLE) {
                                peer->last_reset = PEER_DOWN_WAITING_NHT;
                                valid_nexthops = 0;