Merge pull request #13895 from mjstapp/fix_ospf_sync_json_null

ospfd: check for NULLs in ldp-igp sync json code
FRRouting · Jul 2, 2023 · 913f02f · 913f02f
2 parents 1f322e4 + 864a3bc
commit 913f02f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -4301,6 +4301,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();