pimd: Another null pointer dereference

When starting up with a large # of streams
it is possible to have a timing where we
do not yet have a pim_ifp.

Ticket: CM-12636
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-08-24 16:09:28 -04:00
parent 3f07087b69
commit da55afba15

View File

@ -1070,7 +1070,7 @@ pim_upstream_inherited_olist (struct pim_upstream *up)
int output_intf = 0;
pim_ifp = up->rpf.source_nexthop.interface->info;
if (!up->channel_oil)
if (pim_ifp && !up->channel_oil)
up->channel_oil = pim_channel_oil_add (&up->sg, pim_ifp->mroute_vif_index);
for (ALL_LIST_ELEMENTS (vrf_iflist (VRF_DEFAULT), ifnode, ifnextnode, ifp))