diff --git a/pimd/pim_mlag.c b/pimd/pim_mlag.c
index 47735475f3..78be914cee 100644
--- a/pimd/pim_mlag.c
+++ b/pimd/pim_mlag.c
@@ -583,7 +583,9 @@ static void pim_mlag_process_mlagd_state_change(struct mlag_status msg)
 		router->mlag_role = msg.my_role;
 	}
 
-	strcpy(router->peerlink_rif, msg.peerlink_rif);
+	strlcpy(router->peerlink_rif, msg.peerlink_rif,
+		sizeof(router->peerlink_rif));
+
 	/* XXX - handle the case where we may rx the interface name from the
 	 * MLAG daemon before we get the interface from zebra.
 	 */
diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index a9f1d9335a..ef5f478226 100644
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -1261,11 +1261,11 @@ void pim_rp_show_information(struct pim_instance *pim, struct vty *vty, bool uj)
 			char buf[48];
 
 			if (rp_info->rp_src == RP_SRC_STATIC)
-				strcpy(source, "Static");
+				strlcpy(source, "Static", sizeof(source));
 			else if (rp_info->rp_src == RP_SRC_BSR)
-				strcpy(source, "BSR");
+				strlcpy(source, "BSR", sizeof(source));
 			else
-				strcpy(source, "None");
+				strlcpy(source, "None", sizeof(source));
 			if (uj) {
 				/*
 				 * If we have moved on to a new RP then add the