From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 24 Aug 2016 15:23:41 +0000 (-0400)
Subject: pimd: Fix crash in channel_oil_add_oif
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~263
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=75395e6a326881b564916961e2771ad404f23a1d;p=mirror_frr.git

pimd: Fix crash in channel_oil_add_oif

Remove assert, warn user that there is a
problem and move on.

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

diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c
index d3895ea28..e09dc3f08 100644
--- a/pimd/pim_oil.c
+++ b/pimd/pim_oil.c
@@ -212,7 +212,15 @@ int pim_channel_add_oif(struct channel_oil *channel_oil,
   struct pim_interface *pim_ifp;
   int old_ttl;
 
-  zassert(channel_oil);
+  /*
+   * If we've gotten here we've gone bad, but let's
+   * not take down pim
+   */
+  if (!channel_oil)
+    {
+      zlog_warn ("Attempt to Add OIF for non-existent channel oil");
+      return -1;
+    }
 
   pim_ifp = oif->info;