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)

diff --git a/ospfd/ospf_ldp_sync.c b/ospfd/ospf_ldp_sync.c
index 77e96f1733872af000af99e4100dad2981d2ee83..2f0884bb5b20fcef17311c4ff68d374b178a0673 100644 (file)
--- a/ospfd/ospf_ldp_sync.c
+++ b/ospfd/ospf_ldp_sync.c
@@ -658,6 +658,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();
@@ -693,6 +696,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 ed3d09b1bd6e51eb6dfe5e6765a2011eba28dbe0..7798eaf84bbd4c45b25390f9b79289e8d8ecf213 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -4096,6 +4096,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();