From 8ccbc80f01ca6181e1b00c033389a79d87dbc70e Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 27 Sep 2016 19:59:34 -0400 Subject: [PATCH] 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 --- pimd/pim_join.c | 2 ++ 1 file changed, 2 insertions(+) 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); -- 2.39.5