Fcalva/fxlibc
1
0
Fork 0
mirror of https://git.planet-casio.com/Vhex-Kernel-Core/fxlibc.git synced 2024-12-29 13:03:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

stdlib: fix saturation in strtol, strtoul, strtoll, strtoull

Browse source
This commit is contained in:
Lephenixnoir 2021-05-20 15:38:37 +02:00
parent 9de2f5c391
commit bc53e756a8
No known key found for this signature in database
GPG key ID: 1BBA026E13FC0495
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libc/stdlib/stdlib_p.h
View file

@ -15,7 +15,7 @@
(depending on use_unsigned). Signedness only affects the range of values (depending on use_unsigned). Signedness only affects the range of values
that are considered to be ERANGE, and both results are stored in *outl. that are considered to be ERANGE, and both results are stored in *outl.
Similarly, if outll is non-NULL, strto_int produces a long long or unsigned Similarly, if outll is non-NULL, strto_int produces a long long or unsigned
long long result. long long result. Only one pointer should be non-NULL.
On platforms where long is 32-bit, 64-bit operations are performed only if On platforms where long is 32-bit, 64-bit operations are performed only if
outll is non-NULL. This is because multiplications with overflow can be outll is non-NULL. This is because multiplications with overflow can be

10
src/libc/stdlib/strto_int.c
View file

@ -96,6 +96,16 @@ int strto_int(char const * restrict ptr, char ** restrict endptr, int base,
errno_value = ERANGE; errno_value = ERANGE;
} }
/* Handle overflows */
if(outl && errno_value == ERANGE) {
if(use_unsigned) xl = ULONG_MAX;
else xl = negative ? LONG_MIN : LONG_MAX;
}
if(outll && errno_value == ERANGE) {
if(use_unsigned) xll = ULLONG_MAX;
else xll = negative ? LLONG_MIN : LLONG_MAX;
}
if(outl) *outl = xl; if(outl) *outl = xl;
if(outll) *outll = xll; if(outll) *outll = xll;
if(endptr && valid) *endptr = (char *)ptr; if(endptr && valid) *endptr = (char *)ptr;