summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2023-04-14 09:54:04 -0400
committerGitHub <noreply@github.com>2023-04-14 09:54:04 -0400
commitb1251df789341a06aa844d2cd9b49b6f37e09a1a (patch)
treee925c90a7fc1a6e5d143dbf1f5a134c548cd94bd
parenta79721ebbda00d70b7d7c04472434a724b22a9f8 (diff)
parent75b10fcd1a9cf59ff20de416a675538a4d3698d4 (diff)
Merge pull request #13305 from FRRouting/mergify/bp/stable/8.5/pr-13301
bgpd: Fix crash for `show bgp ... neighbor received-routes detail|PREFIX (backport #13301)
-rw-r--r--bgpd/bgp_route.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index ebb6a5b909..7bb6a0e5bc 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -11851,11 +11851,13 @@ void route_vty_out_detail_header(struct vty *vty, struct bgp *bgp,
vty_out(vty,
"BGP routing table entry for %s%s%pFX, version %" PRIu64
"\n",
- ((safi == SAFI_MPLS_VPN || safi == SAFI_ENCAP)
+ (((safi == SAFI_MPLS_VPN ||
+ safi == SAFI_ENCAP) &&
+ prd)
? prefix_rd2str(prd, buf1,
sizeof(buf1))
: ""),
- safi == SAFI_MPLS_VPN ? ":" : "", p,
+ safi == SAFI_MPLS_VPN && prd ? ":" : "", p,
dest->version);
} else {