Merge pull request FRRouting#13904 from FRRouting/mergify/bp/dev/9.0/…

…pr-13895 ospfd: check for NULLs in ldp-igp sync json code (backport FRRouting#13895)
opensourcerouting · Jul 3, 2023 · 17b938a · 17b938a
2 parents d63f55c + 5ec72f9
commit 17b938a
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
@@ -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();