[PATCH] test: unicode: fix a sizeof() vs ARRAY_SIZE() bug

Heinrich Schuchardt xypron.glpk at gmx.de
Thu Jul 27 10:50:41 CEST 2023


On 7/27/23 09:12, Dan Carpenter wrote:
> The u16_strlcat() is in units of u16 not bytes.  So the limit needs to
> be ARRAY_SIZE() instead of sizeof().
>

Reviewed-by: Heinrich Schuchardt <xypron.glpk at gmx.de>

> Signed-off-by: Dan Carpenter <dan.carpenter at linaro.org>
> ---
>   test/unicode_ut.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/test/unicode_ut.c b/test/unicode_ut.c
> index b27d7116b9ee..62ff5d10bf94 100644
> --- a/test/unicode_ut.c
> +++ b/test/unicode_ut.c
> @@ -807,12 +807,12 @@ static int unicode_test_u16_strlcat(struct unit_test_state *uts)
>
>   	/* dest and src are empty string */
>   	memset(buf, 0, sizeof(buf));
> -	ret = u16_strlcat(buf, &null_src, sizeof(buf));
> +	ret = u16_strlcat(buf, &null_src, ARRAY_SIZE(buf));
>   	ut_asserteq(1, ret);
>
>   	/* dest is empty string */
>   	memset(buf, 0, sizeof(buf));
> -	ret = u16_strlcat(buf, src, sizeof(buf));
> +	ret = u16_strlcat(buf, src, ARRAY_SIZE(buf));
>   	ut_asserteq(5, ret);
>   	ut_assert(!unicode_test_u16_strcmp(buf, src, 40));
>
> @@ -820,7 +820,7 @@ static int unicode_test_u16_strlcat(struct unit_test_state *uts)
>   	memset(buf, 0xCD, (sizeof(buf) - sizeof(u16)));
>   	buf[39] = 0;
>   	memcpy(buf, dest, sizeof(dest));
> -	ret = u16_strlcat(buf, &null_src, sizeof(buf));
> +	ret = u16_strlcat(buf, &null_src, ARRAY_SIZE(buf));
>   	ut_asserteq(6, ret);
>   	ut_assert(!unicode_test_u16_strcmp(buf, dest, 40));
>



More information about the U-Boot mailing list