summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Stapp <mjs@labn.net>2023-06-30 09:44:00 -0400
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2023-07-02 19:40:55 +0000
commit5ec72f956062105f6a8a7e753db11e835ba897af (patch)
tree1ea94af603f0f79a44f7fd36bd311d2d435ba69d
parentc9a420b9c1ae7ddb9a2f04ea7ca09617dcbb888d (diff)
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 <mjs@labn.net> (cherry picked from commit 864a3bc1855ec8027fec8d6f400adb44e1ecbfcf)
-rw-r--r--ospfd/ospf_ldp_sync.c6
-rw-r--r--ospfd/ospf_vty.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ospfd/ospf_ldp_sync.c b/ospfd/ospf_ldp_sync.c
index b97e87faa0..4aab880d22 100644
--- a/ospfd/ospf_ldp_sync.c
+++ b/ospfd/ospf_ldp_sync.c
@@ -637,6 +637,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();
@@ -672,6 +675,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 0ee42e0e70..5cd70c7c22 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -4175,6 +4175,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();