From 59402d840e517d4bd08cb7b70d25739e88d78cef Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 3 Jul 2023 12:55:48 -0400 Subject: [PATCH 1/2] ospfd: Ensure `show ip ospf interface` json code is guarded When not using json, do not allocate json memory. Signed-off-by: Donald Sharp --- ospfd/ospf_vty.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 74eb5c7620..863055bf42 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -3690,7 +3690,8 @@ static void show_ip_ospf_interface_sub(struct vty *vty, struct ospf *ospf, "Use all fields following ospfEnabled from interfaceIp hierarchy") #endif - json_oi = json_object_new_object(); + if (use_json) + json_oi = json_object_new_object(); if (CHECK_FLAG(oi->connected->flags, ZEBRA_IFA_UNNUMBERED)) { if (use_json) { From cc64917540c54617bc180077343d76f73edc8c00 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 3 Jul 2023 13:00:07 -0400 Subject: [PATCH 2/2] bgpd: All paths bgp_vrf have already been derefed Signed-off-by: Donald Sharp --- bgpd/bgp_evpn_vty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index 3a5047f152..ae9e75b236 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -424,7 +424,7 @@ static void display_l3vni(struct vty *vty, struct bgp *bgp_vrf, } vty_out(vty, " Advertise-gw-macip : %s\n", "n/a"); vty_out(vty, " Advertise-svi-macip : %s\n", "n/a"); - if (bgp_vrf && bgp_vrf->evpn_info) { + if (bgp_vrf->evpn_info) { vty_out(vty, " Advertise-pip: %s\n", bgp_vrf->evpn_info->advertise_pip ? "Yes" : "No");