OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

libc: Modify the check length 

We should not check the length of both strings at the same time.

Signed-off-by: wangmingrong1 <wangmingrong1@xiaomi.com>
This commit is contained in:
wangmingrong1 2024-09-24 17:07:42 +08:00 committed by Xiang Xiao
parent e466c637fc
commit b22e8c7c1c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/libc/machine/arch_libc.c
View File

@ -254,8 +254,13 @@ int strncmp(FAR const char *s1, FAR const char *s2, size_t n)
{
# ifdef CONFIG_MM_KASAN
# ifndef CONFIG_MM_KASAN_DISABLE_READS_CHECK
__asan_loadN((FAR void *)s1, n);
__asan_loadN((FAR void *)s2, n);
size_t size_s1 = arch_strnlen(s1, n);
size_t size_s2 = arch_strnlen(s2, n);
size_t size;
size = size_s1 < size_s2 ? size_s1 : size_s2;
__asan_loadN((FAR void *)s1, size);
__asan_loadN((FAR void *)s2, size);
# endif
# endif
return arch_strncmp(s1, s2, n);