From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 24 Aug 2016 19:35:09 +0000 (-0400)
Subject: pimd: Do not crash when attempting to install a mroute.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~261
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3f07087b695d48f1985f2f7387315616dcf14436;p=matthieu%2Ffrr.git

pimd: Do not crash when attempting to install a mroute.

When installing a mroute on rpf change make sure
that we have oil for it at this time.

Ticket: CM-12636
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index aa1121c8a2..8a466e4035 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -347,7 +347,7 @@ static void scan_upstream_rpf_cache()
 	 * where the mroute has not been installed
 	 * so install it.
 	 */
-	if (!up->channel_oil->installed)
+	if (up->channel_oil && !up->channel_oil->installed)
           pim_mroute_add (up->channel_oil);
 
 	/*