From 20e81e185746ba1b222e5c30d23f81c60a96c2d9 Mon Sep 17 00:00:00 2001 From: Stephen Worley Date: Fri, 21 Oct 2022 11:18:12 -0400 Subject: [PATCH] bgpd: fix vni_str NULL check in evpn rt show run Fix the vni_str NULL check for wildcard route-targets in evpn show run. This will never be NULL if we add 1 here. Though it should also never be NULL since ":" should always exist. Better to be safe than sorry. Signed-off-by: Stephen Worley --- bgpd/bgp_evpn_vty.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index f920a783b3..24fa2b2a53 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -6625,11 +6625,14 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi, if (CHECK_FLAG(l3rt->flags, BGP_VRF_RT_WILD)) { char *vni_str = NULL; - vni_str = strchr(ecom_str, ':') + 1; + vni_str = strchr(ecom_str, ':'); if (!vni_str) continue; /* This should never happen */ + /* Move pointer to vni */ + vni_str += 1; + vty_out(vty, " route-target import *:%s\n", vni_str);