From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 27 Sep 2016 23:59:34 +0000 (-0400)
Subject: pimd: Fix crash when looking at S,G from *,G
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~186
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8ccbc80f01ca6181e1b00c033389a79d87dbc70e;p=mirror%2Ffrr.git

pimd: Fix crash when looking at S,G from *,G

When looping over S,G's associated with a *,G,
there can exist situations where we have not created
the channel oil for the S,G yet.  Don't allow this
to crash the system.

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

diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index c92be18ddf..08c1c7b93a 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -210,6 +210,8 @@ static void recv_prune(struct interface *ifp,
 			     __FILE__, __PRETTY_FUNCTION__,
 			     buff, pim_str_sg_dump (&child->sg));
 		}
+              if (!c_oil)
+                continue;
 
 	      if (!pim_upstream_evaluate_join_desired (child))
 	        pim_channel_del_oif (c_oil, ifp, PIM_OIF_FLAG_PROTO_PIM);