diff options
| author | paco <paco@voltanet.io> | 2018-06-25 15:43:04 +0200 |
|---|---|---|
| committer | paco <paco@voltanet.io> | 2018-06-25 16:37:04 +0200 |
| commit | a2d7fdfeb013c9cf5ae624ae89ce2f4acec3ba9d (patch) | |
| tree | 5a1793b1d8c553d4775b525499d56fc1406eda84 | |
| parent | 3a743cb7ec5fd1e91e0803487c606cf63e54c22b (diff) | |
eigrpd ospfd: null chk (Coverity 1458168 1455335)
Signed-off-by: F. Aragon <paco@voltanet.io>
| -rw-r--r-- | eigrpd/eigrp_topology.c | 2 | ||||
| -rw-r--r-- | ospfd/ospfd.c | 7 |
2 files changed, 6 insertions, 3 deletions
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; |