Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-debug-updates-prefix

This commit is contained in:
Daniel Walton 2017-09-27 13:39:13 +00:00
commit b8d6c2c11e

View File

@ -229,6 +229,7 @@ static struct rp_info *pim_rp_find_match_group(struct pim_instance *pim,
struct prefix *p, *bp;
struct route_node *rn;
bp = NULL;
for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) {
if (rp_info->plist) {
plist = prefix_list_lookup(AFI_IP, rp_info->plist);
@ -242,7 +243,7 @@ static struct rp_info *pim_rp_find_match_group(struct pim_instance *pim,
continue;
}
if (bp->prefixlen < p->prefixlen) {
if (bp && bp->prefixlen < p->prefixlen) {
best = rp_info;
bp = p;
}