From 846ef662920d838cd15a5e9b6b90f80ee16be5de Mon Sep 17 00:00:00 2001 From: Jafar Al-Gharaibeh Date: Tue, 2 May 2017 12:15:06 -0500 Subject: [PATCH] Fix: reverse logic of when to pass the supplied group address This was causing a crash when no group address was passed because a garbage pointer valuse was used. It also was ignoring the group address when passing one. Signed-off-by: Jafar Al-Gharaibeh --- pimd/pim_cmd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index e7910ade3c..55970987e9 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -3747,9 +3747,10 @@ DEFUN (ip_pim_rp, int idx_ipv4 = 3; if (argc == (idx_ipv4 + 1)) - return pim_rp_cmd_worker (vty, argv[idx_ipv4]->arg, argv[idx_ipv4 + 1]->arg, NULL); - else return pim_rp_cmd_worker (vty, argv[idx_ipv4]->arg, NULL, NULL); + else + return pim_rp_cmd_worker (vty, argv[idx_ipv4]->arg, argv[idx_ipv4 + 1]->arg, NULL); + } DEFUN (ip_pim_rp_prefix_list, @@ -3805,9 +3806,9 @@ DEFUN (no_ip_pim_rp, int idx_ipv4 = 4; if (argc == (idx_ipv4 + 1)) - return pim_no_rp_cmd_worker (vty, argv[idx_ipv4]->arg, argv[idx_ipv4 + 1]->arg, NULL); - else return pim_no_rp_cmd_worker (vty, argv[idx_ipv4]->arg, NULL, NULL); + else + return pim_no_rp_cmd_worker (vty, argv[idx_ipv4]->arg, argv[idx_ipv4 + 1]->arg, NULL); } DEFUN (no_ip_pim_rp_prefix_list, -- 2.39.5