sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/assert: Replace twice strlcpy with single snprintf

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-06-06 16:13:27 +08:00 committed by Petro Karashchenko
parent b02db04e00
commit 2b2830c252
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/src/common/arm_assert.c
View File

@ -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++);
}
}

7
arch/risc-v/src/common/riscv_assert.c
View File

@ -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++);
}
}

7
arch/xtensa/src/common/xtensa_dumpstate.c
View File

@ -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++);
}
}