Merge pull request #16692 from donaldsharp/zebra_avoid_ng_null

zebra: Convince SA that the ng will always be valid
FRRouting · Aug 30, 2024 · 6bfd311 · 6bfd311
2 parents c0f4972 + 8ad5643
commit 6bfd311
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
@@ -4413,7 +4413,8 @@ int rib_add_multipath(afi_t afi, safi_t safi, struct prefix *p,
 				return -1;
 			}
 
-			if (ifp->ifindex == ng->nexthop->ifindex)
+			if (ng && ng->nexthop &&
+			    ifp->ifindex == ng->nexthop->ifindex)
 				re->type = ZEBRA_ROUTE_CONNECT;
 		}
 	}