proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 13:13:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2547 from pacovn/Coverity_1458168_Dereference_null_return_value

Browse Source 
eigrpd ospfd: null check (Coverity 1458168 1455335)
This commit is contained in:
Russ White 2018-06-26 11:14:07 -04:00 committed by GitHub
commit 884cc57a96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eigrpd/eigrp_topology.c
View File

@ -448,6 +448,8 @@ void eigrp_topology_update_node_flags(struct eigrp_prefix_entry *dest)
struct eigrp_nexthop_entry *entry; struct eigrp_nexthop_entry *entry;
struct eigrp *eigrp = eigrp_lookup(); struct eigrp *eigrp = eigrp_lookup();
assert(eigrp);
for (ALL_LIST_ELEMENTS_RO(dest->entries, node, entry)) { for (ALL_LIST_ELEMENTS_RO(dest->entries, node, entry)) {
if (entry->reported_distance < dest->fdistance) { if (entry->reported_distance < dest->fdistance) {
// is feasible successor, can be successor // is feasible successor, can be successor

7
ospfd/ospfd.c
View File

@ -243,13 +243,14 @@ static struct ospf *ospf_new(unsigned short instance, const char *name)
zlog_debug( zlog_debug(
"%s: Create new ospf instance with vrf_name %s vrf_id %u", "%s: Create new ospf instance with vrf_name %s vrf_id %u",
__PRETTY_FUNCTION__, name, new->vrf_id); __PRETTY_FUNCTION__, name, new->vrf_id);
if (vrf)
ospf_vrf_link(new, vrf);
} else { } else {
new->vrf_id = VRF_DEFAULT; new->vrf_id = VRF_DEFAULT;
vrf = vrf_lookup_by_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); ospf_zebra_vrf_register(new);
new->abr_type = OSPF_ABR_DEFAULT; new->abr_type = OSPF_ABR_DEFAULT;