From: paco <paco@voltanet.io>
Date: Mon, 25 Jun 2018 13:43:04 +0000 (+0200)
Subject: eigrpd ospfd: null chk (Coverity 1458168 1455335)
X-Git-Tag: frr-6.1-dev~248^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a2d7fdfeb013c9cf5ae624ae89ce2f4acec3ba9d;p=matthieu%2Ffrr.git

eigrpd ospfd: null chk (Coverity 1458168 1455335)

Signed-off-by: F. Aragon <paco@voltanet.io>
---

diff --git a/eigrpd/eigrp_topology.c b/eigrpd/eigrp_topology.c
index 4e26446ebe..8ca0e282a8 100644
--- a/eigrpd/eigrp_topology.c
+++ b/eigrpd/eigrp_topology.c
@@ -448,6 +448,8 @@ void eigrp_topology_update_node_flags(struct eigrp_prefix_entry *dest)
 	struct eigrp_nexthop_entry *entry;
 	struct eigrp *eigrp = eigrp_lookup();
 
+	assert(eigrp);
+
 	for (ALL_LIST_ELEMENTS_RO(dest->entries, node, entry)) {
 		if (entry->reported_distance < dest->fdistance) {
 			// is feasible successor, can be successor
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 4cf38439c6..f315421843 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -243,13 +243,14 @@ static struct ospf *ospf_new(unsigned short instance, const char *name)
 			zlog_debug(
 				"%s: Create new ospf instance with vrf_name %s vrf_id %u",
 				__PRETTY_FUNCTION__, name, new->vrf_id);
-		if (vrf)
-			ospf_vrf_link(new, vrf);
 	} else {
 		new->vrf_id = VRF_DEFAULT;
 		vrf = vrf_lookup_by_id(VRF_DEFAULT);
-		ospf_vrf_link(new, vrf);
 	}
+
+	if (vrf)
+		ospf_vrf_link(new, vrf);
+
 	ospf_zebra_vrf_register(new);
 
 	new->abr_type = OSPF_ABR_DEFAULT;