From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 27 Oct 2016 22:27:28 +0000 (-0400)
Subject: pimd: Make sure we have valid pointer when printing debugs
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~159
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f4075cb472efca96d20df6b9f7a1f563831a33ae;p=mirror%2Ffrr.git

pimd: Make sure we have valid pointer when printing debugs

When we print a debug in the pim_upstream_add, there
exists failure cases for pim_upstream_new where
we cannot create a upstream data structure.  Make
sure the debug handles it right.

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

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index ee26683547..7264c0de55 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -574,10 +574,17 @@ struct pim_upstream *pim_upstream_add(struct prefix_sg *sg,
   }
 
   if (PIM_DEBUG_TRACE)
-    zlog_debug("%s(%s): (%s), found: %d: ref_count: %d",
-	       __PRETTY_FUNCTION__, name,
-	       pim_str_sg_dump (&up->sg), found,
-	       up->ref_count);
+    {
+      if (up)
+	zlog_debug("%s(%s): (%s), found: %d: ref_count: %d",
+		   __PRETTY_FUNCTION__, name,
+		   pim_str_sg_dump (&up->sg), found,
+		   up->ref_count);
+      else
+	zlog_debug("%s(%s): (%s) failure to create",
+		   __PRETTY_FUNCTION__, name,
+		   pim_str_sg_dump (sg));
+    }
 
   return up;
 }