From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 24 May 2017 11:45:18 +0000 (-0400)
Subject: pimd: Fix crash in 'show ip multicast vrf..'
X-Git-Tag: frr-4.0-dev~468^2~76
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=bc14b6c7a4136d6f4df3a0f7dc2b82569e112846;p=mirror%2Ffrr.git

pimd: Fix crash in 'show ip multicast vrf..'

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

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index f7a46e3171..a37f08aeb9 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -3933,11 +3933,14 @@ DEFUN (show_ip_multicast,
 {
 	int idx = 2;
 	struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx);
-	struct pim_instance *pim = vrf->info;
+	struct pim_instance *pim;
 	time_t now = pim_time_monotonic_sec();
-
 	char uptime[10];
 
+	if (!vrf)
+		return CMD_WARNING;
+	pim = vrf->info;
+
 	vty_out(vty, "Mroute socket descriptor:");
 
 	vty_out(vty, " %d(%s)\n", pim->mroute_socket, vrf->name);