Merge pull request #2588 from pacovn/Clang_dereference1

bgpd isisd: null check (Clang scan)
This commit is contained in:
Russ White 2018-06-29 18:12:48 -04:00 committed by GitHub
commit 6f7f19c4cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -4243,7 +4243,7 @@ void bgp_evpn_unconfigure_import_rt_for_vrf(struct bgp *bgp_vrf,
list_delete_node(bgp_vrf->vrf_import_rtl, node_to_del);
/* fallback to auto import rt, if this was the last RT */
if (list_isempty(bgp_vrf->vrf_import_rtl)) {
if (bgp_vrf->vrf_import_rtl && list_isempty(bgp_vrf->vrf_import_rtl)) {
UNSET_FLAG(bgp_vrf->vrf_flags, BGP_VRF_IMPORT_RT_CFGD);
evpn_auto_rt_import_add_for_vrf(bgp_vrf);
}

View File

@ -1473,8 +1473,9 @@ static void isis_print_paths(struct vty *vty, struct isis_vertex_queue *queue,
vty_out(vty, "%-20s %-12s %-6u ",
vid2string(vertex, buff, sizeof(buff)),
vtype2string(vertex->type), vertex->d_N);
for (unsigned int i = 0; i < MAX(listcount(vertex->Adj_N),
listcount(vertex->parents));
for (unsigned int i = 0;
i < MAX(vertex->Adj_N ? listcount(vertex->Adj_N) : 0,
vertex->parents ? listcount(vertex->parents) : 0);
i++) {
if (anode) {
adj = listgetdata(anode);