diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-09-27 15:39:13 +0200 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-09-27 15:39:13 +0200 |
| commit | b8d6c2c11e9800970b187fd1be4b940981386534 (patch) | |
| tree | 5d19d58ce5099e7e72bca7334c18244294d23074 | |
| parent | Merge branch 'master' into bgpd-debug-updates-prefix (diff) | |
| parent | Merge pull request #1257 from donaldsharp/pim_bp (diff) | |
| download | frr-b8d6c2c11e9800970b187fd1be4b940981386534.tar.xz frr-b8d6c2c11e9800970b187fd1be4b940981386534.zip | |
Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-debug-updates-prefix
| -rw-r--r-- | pimd/pim_rp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c index 54d0d2b7d..5c7561f58 100644 --- a/pimd/pim_rp.c +++ b/pimd/pim_rp.c @@ -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; } |