summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2021-04-09 08:14:17 -0400
committerGitHub <noreply@github.com>2021-04-09 08:14:17 -0400
commit750b1916b99423f441bedd68cba6a722e67485c7 (patch)
tree10f3c671fdf8fb84096481860f234fb5d2a36af1
parent455bc41000b7bb285ffc528e68f9146655357788 (diff)
parent83c444220277ff40115e6fd6bdfb0cace8c52362 (diff)
Merge pull request #8422 from idryzhov/fix-show-ip-ospf
ospfd: fix crash on "show ip ospf neighbor detail"
-rw-r--r--bgpd/bgp_bfd.c3
-rw-r--r--lib/bfd.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c
index f1bdcc8bb4..958d7cf0ed 100644
--- a/bgpd/bgp_bfd.c
+++ b/bgpd/bgp_bfd.c
@@ -424,8 +424,7 @@ void bgp_bfd_peer_config_write(struct vty *vty, const struct peer *peer,
void bgp_bfd_show_info(struct vty *vty, const struct peer *peer,
json_object *json_neigh)
{
- if (peer->bfd_config->session)
- bfd_sess_show(vty, json_neigh, peer->bfd_config->session);
+ bfd_sess_show(vty, json_neigh, peer->bfd_config->session);
}
DEFUN (neighbor_bfd,
diff --git a/lib/bfd.c b/lib/bfd.c
index 176269cc5b..276d6c685e 100644
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -988,6 +988,9 @@ void bfd_sess_show(struct vty *vty, struct json_object *json,
json_object *json_bfd = NULL;
char time_buf[64];
+ if (!bsp)
+ return;
+
/* Show type. */
if (json) {
json_bfd = json_object_new_object();