diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2021-03-02 21:51:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 21:51:57 +0100 |
| commit | 6640d900cd6082b961c8ededc8cdb6980426696c (patch) | |
| tree | ca1a045c1840cc185c2b1d6b43df5469f0370117 | |
| parent | Merge pull request #8152 from idryzhov/fix-zebra-blackhole (diff) | |
| parent | bgpd, pimd: fix coverity SA warnings (diff) | |
| download | frr-6640d900cd6082b961c8ededc8cdb6980426696c.tar.xz frr-6640d900cd6082b961c8ededc8cdb6980426696c.zip | |
Merge pull request #8170 from mjstapp/fix_sa_pim
bgpd, pimd: fix coverity SA warnings
| -rw-r--r-- | bgpd/bgp_evpn_mh.c | 2 | ||||
| -rw-r--r-- | pimd/pim_nb_config.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bgpd/bgp_evpn_mh.c b/bgpd/bgp_evpn_mh.c index 42f393758..175514f63 100644 --- a/bgpd/bgp_evpn_mh.c +++ b/bgpd/bgp_evpn_mh.c @@ -1702,7 +1702,7 @@ static void bgp_evpn_local_es_activate(struct bgp *bgp, struct bgp_evpn_es *es, /* generate EAD-ES */ build_evpn_type1_prefix(&p, BGP_EVPN_AD_ES_ETH_TAG, &es->esi, es->originator_ip); - bgp_evpn_type1_route_update(bgp, es, NULL, &p); + (void)bgp_evpn_type1_route_update(bgp, es, NULL, &p); } } diff --git a/pimd/pim_nb_config.c b/pimd/pim_nb_config.c index 11cfe0996..5963a651d 100644 --- a/pimd/pim_nb_config.c +++ b/pimd/pim_nb_config.c @@ -2411,7 +2411,7 @@ int lib_interface_pim_address_family_mroute_oif_modify( } #ifdef PIM_ENFORCE_LOOPFREE_MFC - if (iif->ifindex == oif->ifindex) { + if (oif && iif && (iif->ifindex == oif->ifindex)) { strlcpy(args->errmsg, "% IIF same as OIF and loopfree enforcement is enabled; rejecting", args->errmsg_len); |