From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 23 Aug 2016 16:25:55 +0000 (-0400)
Subject: pimd: Fix crash on RP.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~271
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4e85d20983cddd6655a263bb5b074df04d65fa32;p=matthieu%2Ffrr.git

pimd: Fix crash on RP.

When register stop was received but the upstream
creation fails we are not handling it properly.
Note and return.

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

diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index bd41f1f4f0..46601c0dcb 100644
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -323,7 +323,11 @@ pim_register_recv (struct interface *ifp,
     if (!upstream)
       {
 	upstream = pim_upstream_add (&sg, ifp);
-
+        if (!upstream)
+          {
+            zlog_warn ("Failure to crate upstream state");
+            return 1;
+          }
         upstream->upstream_register = src_addr;
 	pim_rp_set_upstream_addr (&upstream->upstream_addr, sg.src, sg.grp);
 	pim_nexthop_lookup (&upstream->rpf.source_nexthop,