Merge pull request #17632 from opensourcerouting/fix/backport_9b0b928…

…2d317a9aeab36d9a8b08a35fe9a172c4b_10.0 bgpd: Fix bgp core with a possible Intf delete (backport)
FRRouting · Dec 11, 2024 · 5af15b0 · 5af15b0
2 parents e11efcd + 9c20cd2
commit 5af15b0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
@@ -1166,9 +1166,10 @@ static bool update_ipv6nh_for_route_install(int nh_othervrf, struct bgp *nh_bgp,
 					ifindex =
 						pi->peer->nexthop.ifp->ifindex;
 			if (!ifindex) {
-				if (pi->peer->conf_if)
-					ifindex = pi->peer->ifp->ifindex;
-				else if (pi->peer->ifname)
+				if (pi->peer->conf_if) {
+					if (pi->peer->ifp)
+						ifindex = pi->peer->ifp->ifindex;
+				} else if (pi->peer->ifname)
 					ifindex = ifname2ifindex(
 						pi->peer->ifname,
 						pi->peer->bgp->vrf_id);