d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libc: Fix parsing of hexadecimal numbers in strtol() family.

Browse Source 
This had previously been partly fixed in 2571c7f720.

MFC after:	1 week
Reviewed by:	imp, allanjude, emaste
Differential Revision:	https://reviews.freebsd.org/D41510
This commit is contained in:
Dag-Erling Smørgrav 2023-08-24 21:31:03 +00:00
parent 7ea28254ec
commit b8b6bef43f
8 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libc/iconv/_strtol.h
View File

@ -83,7 +83,10 @@ _FUNCNAME(const char *nptr, char **endptr, int base)
c = *s++;
}
if ((base == 0 || base == 16) &&
c == '0' && (*s == 'x' || *s == 'X')) {
c == '0' && (*s == 'x' || *s == 'X') &&
((s[1] >= '0' && s[1] <= '9') ||
(s[1] >= 'A' && s[1] <= 'F') ||
(s[1] >= 'a' && s[1] <= 'f'))) {
c = s[1];
s += 2;
base = 16;

5
lib/libc/iconv/_strtoul.h
View File

@ -79,7 +79,10 @@ _FUNCNAME(const char *nptr, char **endptr, int base)
c = *s++;
}
if ((base == 0 || base == 16) &&
c == '0' && (*s == 'x' || *s == 'X')) {
c == '0' && (*s == 'x' || *s == 'X') &&
((s[1] >= '0' && s[1] <= '9') ||
(s[1] >= 'A' && s[1] <= 'F') ||
(s[1] >= 'a' && s[1] <= 'f'))) {
c = s[1];
s += 2;
base = 16;

5
lib/libc/locale/wcstoimax.c
View File

@ -78,7 +78,10 @@ wcstoimax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
c = *s++;
}
if ((base == 0 || base == 16) &&
c == L'0' && (*s == L'x' || *s == L'X')) {
c == L'0' && (*s == L'x' || *s == L'X') &&
((s[1] >= L'0' && s[1] <= L'9') ||
(s[1] >= L'A' && s[1] <= L'F') ||
(s[1] >= L'a' && s[1] <= L'f'))) {
c = s[1];
s += 2;
base = 16;

7
lib/libc/locale/wcstol.c
View File

@ -63,7 +63,7 @@ wcstol_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int
do {
c = *s++;
} while (iswspace_l(c, locale));
if (c == '-') {
if (c == L'-') {
neg = 1;
c = *s++;
} else {
@ -72,7 +72,10 @@ wcstol_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int
c = *s++;
}
if ((base == 0 || base == 16) &&
c == L'0' && (*s == L'x' || *s == L'X')) {
c == L'0' && (*s == L'x' || *s == L'X') &&
((s[1] >= L'0' && s[1] <= L'9') ||
(s[1] >= L'A' && s[1] <= L'F') ||
(s[1] >= L'a' && s[1] <= L'f'))) {
c = s[1];
s += 2;
base = 16;

5
lib/libc/locale/wcstoll.c
View File

@ -78,7 +78,10 @@ wcstoll_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
c = *s++;
}
if ((base == 0 || base == 16) &&
c == L'0' && (*s == L'x' || *s == L'X')) {
c == L'0' && (*s == L'x' || *s == L'X') &&
((s[1] >= L'0' && s[1] <= L'9') ||
(s[1] >= L'A' && s[1] <= L'F') ||
(s[1] >= L'a' && s[1] <= L'f'))) {
c = s[1];
s += 2;
base = 16;

5
lib/libc/locale/wcstoul.c
View File

@ -72,7 +72,10 @@ wcstoul_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
c = *s++;
}
if ((base == 0 || base == 16) &&
c == L'0' && (*s == L'x' || *s == L'X')) {
c == L'0' && (*s == L'x' || *s == L'X') &&
((s[1] >= L'0' && s[1] <= L'9') ||
(s[1] >= L'A' && s[1] <= L'F') ||
(s[1] >= L'a' && s[1] <= L'f'))) {
c = s[1];
s += 2;
base = 16;

5
lib/libc/locale/wcstoull.c
View File

@ -78,7 +78,10 @@ wcstoull_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
c = *s++;
}
if ((base == 0 || base == 16) &&
c == L'0' && (*s == L'x' || *s == L'X')) {
c == L'0' && (*s == L'x' || *s == L'X') &&
((s[1] >= L'0' && s[1] <= L'9') ||
(s[1] >= L'A' && s[1] <= L'F') ||
(s[1] >= L'a' && s[1] <= L'f'))) {
c = s[1];
s += 2;
base = 16;

5
lib/libc/locale/wcstoumax.c
View File

@ -78,7 +78,10 @@ wcstoumax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
c = *s++;
}
if ((base == 0 || base == 16) &&
c == L'0' && (*s == L'x' || *s == L'X')) {
c == L'0' && (*s == L'x' || *s == L'X') &&
((s[1] >= L'0' && s[1] <= L'9') ||
(s[1] >= L'A' && s[1] <= L'F') ||
(s[1] >= L'a' && s[1] <= L'f'))) {
c = s[1];
s += 2;
base = 16;