Skip to content

klibc: fix tiny vsnprintf long long formatting #11600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CYFS3 wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −3
Open

klibc: fix tiny vsnprintf long long formatting #11600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/klibc/rt_vsnprintf_tiny.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,15 @@ static char *print_number(char *buf,
num = (rt_uint16_t)-num;
}
break;
#ifdef RT_KLIBC_USING_VSNPRINTF_LONGLONG
case 'L':
if (num > (~0ULL >> 1))
{
sign = '-';
num = 0ULL - num;
}
break;
#endif /* RT_KLIBC_USING_VSNPRINTF_LONGLONG */
case 'l':
if ((long)num < 0)
{
Expand Down Expand Up @@ -552,7 +560,14 @@ int rt_vsnprintf(char *buf, size_t size, const char *fmt, va_list args)

if (qualifier == 'L')
{
num = va_arg(args, unsigned long long);
if (flags & SIGN)
{
num = (unsigned long long)va_arg(args, long long);
}
else
{
num = va_arg(args, unsigned long long);
}
}
else if (qualifier == 'l')
{
Expand Down
6 changes: 4 additions & 2 deletions src/klibc/utest/TC_rt_sprintf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,10 +897,12 @@ SPRINTF_TEST_CASE(integer_types)
SPRINTF_CHECK("2147483647", buffer, "%li", 2147483647L);
#ifdef RT_KLIBC_USING_VSNPRINTF_LONGLONG
SPRINTF_CHECK("30", buffer, "%lli", 30LL);
#ifdef RT_KLIBC_USING_VSNPRINTF_STANDARD
SPRINTF_CHECK("-9223372036854775807", buffer, "%lli", -9223372036854775807LL);
SPRINTF_CHECK("9223372036854775807", buffer, "%lli", 9223372036854775807LL);
#endif /* RT_KLIBC_USING_VSNPRINTF_STANDARD */
SPRINTF_CHECK("-2147483648", buffer, "%lld", (long long)(rt_int64_t)-2147483648LL);
SPRINTF_CHECK("4294967295", buffer, "%lld", (long long)(rt_int64_t)RT_UINT32_MAX);
SPRINTF_CHECK("-9223372036854775808", buffer, "%lld", (long long)(-9223372036854775807LL - 1LL));
SPRINTF_CHECK("9223372036854775807", buffer, "%lld", 9223372036854775807LL);
#endif /* RT_KLIBC_USING_VSNPRINTF_LONGLONG */
SPRINTF_CHECK("100000", buffer, "%lu", 100000L);
SPRINTF_CHECK("4294967295", buffer, "%lu", 0xFFFFFFFFL);
Expand Down
Loading