bgpd ospf6d: null check (Coverity 1221453 1461297)

diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index 72255e54fbd35b77830b866e9d5bf1e0d0070fd6..491741a35b0e5b74dc360bf58800b79bdb78986c 100644 (file)
--- 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 28c3459825e0a5ce756d2af40c8ba4808a0742d2..5b6691e6bf1b4039f9724a2130d019d18a59cd68 100644 (file)
--- 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))