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 51cd2a127b3f839242b0bfb00b422c2ad7745957..89ad0ba23cfac0fce0c65cb2880e2e35d53a32b7 100644 (file)
--- 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 cdfc54660870456358a1dd3cde3cd0b13ef70e89..660933bd86244a4ec2ae728a939c69aee583bf48 100644 (file)
--- 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();