Merge pull request #18403 from FRRouting/mergify/bp/stable/10.1/pr-18387

donaldsharp · web-flow · commit 72ce90a35a53 · 2025-03-17T08:15:36.000-04:00
bgpd: Fixed crash upon bgp network import-check command (backport #18387)
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -6836,7 +6836,7 @@ void bgp_static_update(struct bgp *bgp, const struct prefix *p,
 						&pi->extra->labels->label[0]);
 			}
 #endif
-			if (pi->extra && pi->extra->vrfleak->bgp_orig)
+			if (pi->extra && pi->extra->vrfleak && pi->extra->vrfleak->bgp_orig)
 				bgp_nexthop = pi->extra->vrfleak->bgp_orig;
 
 			bgp_nexthop_reachability_check(afi, safi, pi, p, dest,

Original file line number	Diff line number	Diff line change
`@@ -6836,7 +6836,7 @@ void bgp_static_update(struct bgp bgp, const struct prefix p,`
`6836`	`6836`	`&pi->extra->labels->label[0]);`
`6837`	`6837`	`}`
`6838`	`6838`	`#endif`
`6839`		`- if (pi->extra && pi->extra->vrfleak->bgp_orig)`
	`6839`	`+ if (pi->extra && pi->extra->vrfleak && pi->extra->vrfleak->bgp_orig)`
`6840`	`6840`	`bgp_nexthop = pi->extra->vrfleak->bgp_orig;`
`6841`	`6841`
`6842`	`6842`	`bgp_nexthop_reachability_check(afi, safi, pi, p, dest,`