From: paco <paco@voltanet.io>
Date: Wed, 20 Jun 2018 16:57:16 +0000 (+0200)
Subject: bgpd ospf6d: null check (Coverity 1221453 1461297)
X-Git-Tag: frr-6.1-dev~277^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cac84a16112b4b8cd875391589e5226d601fa922;p=matthieu%2Ffrr.git

bgpd ospf6d: null check (Coverity 1221453 1461297)
---

diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index 72255e54fb..491741a35b 100644
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -1426,7 +1426,8 @@ DEFUN (vnc_export_nvegroup,
 	if (rfg_new == NULL) {
 		rfg_new = bgp_rfapi_cfg_match_byname(bgp, argv[5]->arg,
 						     RFAPI_GROUP_CFG_VRF);
-		vnc_add_vrf_opener(bgp, rfg_new);
+		if (rfg_new)
+			vnc_add_vrf_opener(bgp, rfg_new);
 	}
 
 	if (rfg_new == NULL) {
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index 28c3459825..5b6691e6bf 100644
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -677,6 +677,10 @@ void ospf6_spf_schedule(struct ospf6 *ospf6, unsigned int reason)
 {
 	unsigned long delay, elapsed, ht;
 
+	/* OSPF instance does not exist. */
+	if (ospf6 == NULL)
+		return;
+
 	ospf6_set_spf_reason(ospf6, reason);
 
 	if (IS_OSPF6_DEBUG_SPF(PROCESS) || IS_OSPF6_DEBUG_SPF(TIME)) {
@@ -686,10 +690,6 @@ void ospf6_spf_schedule(struct ospf6 *ospf6, unsigned int reason)
 			   rbuf);
 	}
 
-	/* OSPF instance does not exist. */
-	if (ospf6 == NULL)
-		return;
-
 	/* SPF calculation timer is already scheduled. */
 	if (ospf6->t_spf_calc) {
 		if (IS_OSPF6_DEBUG_SPF(PROCESS) || IS_OSPF6_DEBUG_SPF(TIME))