From 93a3c738c855a5d0b59d86b4598297f6775a2e5d Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Fri, 30 Jun 2023 09:44:00 -0400 Subject: [PATCH] ospfd: check for NULLs in vty code There were a couple of cli paths that NULL-checked in the vtysh output path, but not in the json path. Signed-off-by: Mark Stapp (cherry picked from commit 864a3bc1855ec8027fec8d6f400adb44e1ecbfcf) --- ospfd/ospf_ldp_sync.c | 6 ++++++ ospfd/ospf_vty.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/ospfd/ospf_ldp_sync.c b/ospfd/ospf_ldp_sync.c index 51cd2a127b..89ad0ba23c 100644 --- a/ospfd/ospf_ldp_sync.c +++ b/ospfd/ospf_ldp_sync.c @@ -651,6 +651,9 @@ static int show_ip_ospf_mpls_ldp_interface_common(struct vty *vty, rn = route_next(rn)) { oi = rn->info; + if (oi == NULL) + continue; + if (use_json) { json_interface_sub = json_object_new_object(); @@ -686,6 +689,9 @@ static int show_ip_ospf_mpls_ldp_interface_common(struct vty *vty, rn = route_next(rn)) { oi = rn->info; + if (oi == NULL) + continue; + if (use_json) json_interface_sub = json_object_new_object(); diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index cdfc546608..660933bd86 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -4094,6 +4094,9 @@ static int show_ip_ospf_interface_traffic_common( rn = route_next(rn)) { oi = rn->info; + if (oi == NULL) + continue; + if (use_json) { json_interface_sub = json_object_new_object(); -- 2.39.5