From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sat, 18 Jul 2020 13:46:06 +0000 (-0400)
Subject: pimd: Prevent Null string %s issues
X-Git-Tag: base_7.5~174^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d76c38ade314bcdc58c2ff69f3b9c80ddf2293d2;p=matthieu%2Ffrr.git

pimd: Prevent Null string %s issues

There are couple spots where group may be NULL and
when we output strings associated with it we should
ensure we are not doing something stupid.

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

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 6ede015a0e..db3f0b8b23 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -6784,12 +6784,13 @@ static int pim_rp_cmd_worker(struct pim_instance *pim, struct vty *vty,
 
 	if (result == PIM_GROUP_BAD_ADDR_MASK_COMBO) {
 		vty_out(vty, "%% Inconsistent address and mask: %s\n",
-			group);
+			group ? group : "No Group Address");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
 	if (result == PIM_GROUP_BAD_ADDRESS) {
-		vty_out(vty, "%% Bad group address specified: %s\n", group);
+		vty_out(vty, "%% Bad group address specified: %s\n",
+			group ? group : "No Group Address");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
@@ -7158,7 +7159,8 @@ static int pim_no_rp_cmd_worker(struct pim_instance *pim, struct vty *vty,
 	int result = pim_rp_del_config(pim, rp, group, plist);
 
 	if (result == PIM_GROUP_BAD_ADDRESS) {
-		vty_out(vty, "%% Bad group address specified: %s\n", group);
+		vty_out(vty, "%% Bad group address specified: %s\n",
+			group ? group : "No Group Address");
 		return CMD_WARNING_CONFIG_FAILED;
 	}