diff --git a/arch/arm/src/common/arm_assert.c b/arch/arm/src/common/arm_assert.c
index 5dd24ea2750..f8e14b20852 100644
--- a/arch/arm/src/common/arm_assert.c
+++ b/arch/arm/src/common/arm_assert.c
@@ -185,13 +185,12 @@ static void arm_dump_task(struct tcb_s *tcb, void *arg)
   else
 #endif
     {
-      FAR char **argv;
+      FAR char **argv = tcb->group->tg_info->argv + 1;
       size_t npos = 0;
 
-      for (argv = tcb->group->tg_info->argv + 1; *argv; argv++)
+      while (*argv != NULL && npos < sizeof(args))
         {
-          npos += strlcpy(args + npos, *argv, sizeof(args) - npos);
-          npos += strlcpy(args + npos, " ", sizeof(args) - npos);
+          npos += snprintf(args + npos, sizeof(args) - npos, "%s ", *argv++);
         }
     }
 
diff --git a/arch/risc-v/src/common/riscv_assert.c b/arch/risc-v/src/common/riscv_assert.c
index 7b831671982..5eecd4675a1 100644
--- a/arch/risc-v/src/common/riscv_assert.c
+++ b/arch/risc-v/src/common/riscv_assert.c
@@ -185,13 +185,12 @@ static void riscv_dump_task(struct tcb_s *tcb, void *arg)
   else
 #endif
     {
-      FAR char **argv;
+      FAR char **argv = tcb->group->tg_info->argv + 1;
       size_t npos = 0;
 
-      for (argv = tcb->group->tg_info->argv + 1; *argv; argv++)
+      while (*argv != NULL && npos < sizeof(args))
         {
-          npos += strlcpy(args + npos, *argv, sizeof(args) - npos);
-          npos += strlcpy(args + npos, " ", sizeof(args) - npos);
+          npos += snprintf(args + npos, sizeof(args) - npos, "%s ", *argv++);
         }
     }
 
diff --git a/arch/xtensa/src/common/xtensa_dumpstate.c b/arch/xtensa/src/common/xtensa_dumpstate.c
index b1ac1f44005..811a90f5933 100644
--- a/arch/xtensa/src/common/xtensa_dumpstate.c
+++ b/arch/xtensa/src/common/xtensa_dumpstate.c
@@ -100,13 +100,12 @@ static void xtensa_dump_task(struct tcb_s *tcb, void *arg)
   else
 #endif
     {
-      FAR char **argv;
+      FAR char **argv = tcb->group->tg_info->argv + 1;
       size_t npos = 0;
 
-      for (argv = tcb->group->tg_info->argv + 1; *argv; argv++)
+      while (*argv != NULL && npos < sizeof(args))
         {
-          npos += strlcpy(args + npos, *argv, sizeof(args) - npos);
-          npos += strlcpy(args + npos, " ", sizeof(args) - npos);
+          npos += snprintf(args + npos, sizeof(args) - npos, "%s ", *argv++);
         }
     }