glibc/stdlib/tst-strtol-locale-main.c

88 lines
2.6 KiB
C
Raw Normal View History

Fix strtol in Turkish locales (bug 19242). The implementations of strtol and related functions use locale-specific conversions to upper case before determining whether a character is a valid letter in the argument. This means that in Turkish locales such as tr_TR.UTF-8 and tr_TR.ISO-8859-9, "i" is interpreted as not being a valid number, when if the base passed to strtol is 19 or more it should be interpreted as the number 18. ISO C explicitly says "The letters from a (or A) through z (or Z) are ascribed the values 10 through 35", so clearly intends the standard ASCII letters (otherwise you wouldn't generally have exactly 26 letters to ascribe such values) (whereas white-space must be identified according to the locale). In particular, 'i' and 'I' must be understood to be in that sequence. This patch makes the code do the case conversions and classification in the C locale; the user's locale remains used for whitespace testing (explicitly correct according to ISO C). Note that the way the code worked, the only non-ASCII letter that would previously have been accepted would have been the Turkish 'ı' (dotless 'i'), because the uppercase version of that in Turkish locales is 'I'. This patch means that will no longer be accepted, which seems appropriate. Tested for x86_64 and x86. [BZ #19242] * stdlib/strtol_l.c (ISALPHA): Use _nl_C_locobj_ptr for locale. (TOUPPER): Likewise. * stdlib/tst-strtol-locale-main.c: New file. * stdlib/tst-strtol-locale.c: Likewise. * stdlib/Makefile (tests): Add tst-strtol-locale. [$(run-built-tests) = yes] (LOCALES): Add tr_TR.ISO-8859-9. [$(run-built-tests) = yes] ($(objpfx)tst-strtol-locale.out): Depend on $(gen-locales). * wcsmbs/tst-wcstol-locale.c: New file. * wcsmbs/Makefile (tests): Add tst-wcstol-locale. [$(run-built-tests) = yes] (LOCALES): Add tr_TR.UTF-8 and tr_TR.ISO-8859-9. [$(run-built-tests) = yes] ($(objpfx)tst-wcstol-locale.out): Depend on $(gen-locales).
2015-11-23 08:50:53 +00:00
/* Test strtol functions work with all ASCII letters in Turkish
locales (bug 19242).
Copyright (C) 2015-2023 Free Software Foundation, Inc.
Fix strtol in Turkish locales (bug 19242). The implementations of strtol and related functions use locale-specific conversions to upper case before determining whether a character is a valid letter in the argument. This means that in Turkish locales such as tr_TR.UTF-8 and tr_TR.ISO-8859-9, "i" is interpreted as not being a valid number, when if the base passed to strtol is 19 or more it should be interpreted as the number 18. ISO C explicitly says "The letters from a (or A) through z (or Z) are ascribed the values 10 through 35", so clearly intends the standard ASCII letters (otherwise you wouldn't generally have exactly 26 letters to ascribe such values) (whereas white-space must be identified according to the locale). In particular, 'i' and 'I' must be understood to be in that sequence. This patch makes the code do the case conversions and classification in the C locale; the user's locale remains used for whitespace testing (explicitly correct according to ISO C). Note that the way the code worked, the only non-ASCII letter that would previously have been accepted would have been the Turkish 'ı' (dotless 'i'), because the uppercase version of that in Turkish locales is 'I'. This patch means that will no longer be accepted, which seems appropriate. Tested for x86_64 and x86. [BZ #19242] * stdlib/strtol_l.c (ISALPHA): Use _nl_C_locobj_ptr for locale. (TOUPPER): Likewise. * stdlib/tst-strtol-locale-main.c: New file. * stdlib/tst-strtol-locale.c: Likewise. * stdlib/Makefile (tests): Add tst-strtol-locale. [$(run-built-tests) = yes] (LOCALES): Add tr_TR.ISO-8859-9. [$(run-built-tests) = yes] ($(objpfx)tst-strtol-locale.out): Depend on $(gen-locales). * wcsmbs/tst-wcstol-locale.c: New file. * wcsmbs/Makefile (tests): Add tst-wcstol-locale. [$(run-built-tests) = yes] (LOCALES): Add tr_TR.UTF-8 and tr_TR.ISO-8859-9. [$(run-built-tests) = yes] ($(objpfx)tst-wcstol-locale.out): Depend on $(gen-locales).
2015-11-23 08:50:53 +00:00
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
Prefer https to http for gnu.org and fsf.org URLs Also, change sources.redhat.com to sourceware.org. This patch was automatically generated by running the following shell script, which uses GNU sed, and which avoids modifying files imported from upstream: sed -ri ' s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g ' \ $(find $(git ls-files) -prune -type f \ ! -name '*.po' \ ! -name 'ChangeLog*' \ ! -path COPYING ! -path COPYING.LIB \ ! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \ ! -path manual/texinfo.tex ! -path scripts/config.guess \ ! -path scripts/config.sub ! -path scripts/install-sh \ ! -path scripts/mkinstalldirs ! -path scripts/move-if-change \ ! -path INSTALL ! -path locale/programs/charmap-kw.h \ ! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \ ! '(' -name configure \ -execdir test -f configure.ac -o -f configure.in ';' ')' \ ! '(' -name preconfigure \ -execdir test -f preconfigure.ac ';' ')' \ -print) and then by running 'make dist-prepare' to regenerate files built from the altered files, and then executing the following to cleanup: chmod a+x sysdeps/unix/sysv/linux/riscv/configure # Omit irrelevant whitespace and comment-only changes, # perhaps from a slightly-different Autoconf version. git checkout -f \ sysdeps/csky/configure \ sysdeps/hppa/configure \ sysdeps/riscv/configure \ sysdeps/unix/sysv/linux/csky/configure # Omit changes that caused a pre-commit check to fail like this: # remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines git checkout -f \ sysdeps/powerpc/powerpc64/ppc-mcount.S \ sysdeps/unix/sysv/linux/s390/s390-64/syscall.S # Omit change that caused a pre-commit check to fail like this: # remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
<https://www.gnu.org/licenses/>. */
Fix strtol in Turkish locales (bug 19242). The implementations of strtol and related functions use locale-specific conversions to upper case before determining whether a character is a valid letter in the argument. This means that in Turkish locales such as tr_TR.UTF-8 and tr_TR.ISO-8859-9, "i" is interpreted as not being a valid number, when if the base passed to strtol is 19 or more it should be interpreted as the number 18. ISO C explicitly says "The letters from a (or A) through z (or Z) are ascribed the values 10 through 35", so clearly intends the standard ASCII letters (otherwise you wouldn't generally have exactly 26 letters to ascribe such values) (whereas white-space must be identified according to the locale). In particular, 'i' and 'I' must be understood to be in that sequence. This patch makes the code do the case conversions and classification in the C locale; the user's locale remains used for whitespace testing (explicitly correct according to ISO C). Note that the way the code worked, the only non-ASCII letter that would previously have been accepted would have been the Turkish 'ı' (dotless 'i'), because the uppercase version of that in Turkish locales is 'I'. This patch means that will no longer be accepted, which seems appropriate. Tested for x86_64 and x86. [BZ #19242] * stdlib/strtol_l.c (ISALPHA): Use _nl_C_locobj_ptr for locale. (TOUPPER): Likewise. * stdlib/tst-strtol-locale-main.c: New file. * stdlib/tst-strtol-locale.c: Likewise. * stdlib/Makefile (tests): Add tst-strtol-locale. [$(run-built-tests) = yes] (LOCALES): Add tr_TR.ISO-8859-9. [$(run-built-tests) = yes] ($(objpfx)tst-strtol-locale.out): Depend on $(gen-locales). * wcsmbs/tst-wcstol-locale.c: New file. * wcsmbs/Makefile (tests): Add tst-wcstol-locale. [$(run-built-tests) = yes] (LOCALES): Add tr_TR.UTF-8 and tr_TR.ISO-8859-9. [$(run-built-tests) = yes] ($(objpfx)tst-wcstol-locale.out): Depend on $(gen-locales).
2015-11-23 08:50:53 +00:00
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <wchar.h>
#define STR_(X) #X
#define STR(X) STR_(X)
#define FNPFXS STR (FNPFX)
#define CONCAT_(X, Y) X ## Y
#define CONCAT(X, Y) CONCAT_ (X, Y)
#define FNX(FN) CONCAT (FNPFX, FN)
#define TEST(LOC, STR, EXP_VAL, FN, TYPE, FMT) \
do \
{ \
CHAR *ep; \
TYPE val = FNX (FN) (STR, &ep, 36); \
printf ("%s: " FNPFXS #FN " (" SFMT ") == " FMT "\n", LOC, STR, val); \
if (val == (TYPE) (EXP_VAL) && *ep == 0) \
printf ("PASS: %s: " FNPFXS #FN " (" SFMT ")\n", LOC, STR); \
else \
{ \
printf ("FAIL: %s: " FNPFXS #FN " (" SFMT ")\n", LOC, STR); \
result = 1; \
} \
} \
while (0)
static int
test_one_locale (const char *loc)
{
if (setlocale (LC_ALL, loc) == NULL)
{
printf ("setlocale (LC_ALL, \"%s\") failed\n", loc);
return 1;
}
int result = 0;
for (int i = 10; i < 36; i++)
{
CHAR s[2];
s[0] = L_('A') + i - 10;
s[1] = 0;
TEST (loc, s, i, l, long int, "%ld");
TEST (loc, s, i, ul, unsigned long int, "%lu");
TEST (loc, s, i, ll, long long int, "%lld");
TEST (loc, s, i, ull, unsigned long long int, "%llu");
s[0] = L_('a') + i - 10;
s[1] = 0;
TEST (loc, s, i, l, long int, "%ld");
TEST (loc, s, i, ul, unsigned long int, "%lu");
TEST (loc, s, i, ll, long long int, "%lld");
TEST (loc, s, i, ull, unsigned long long int, "%llu");
}
return result;
}
static int
do_test (void)
{
int result = 0;
result |= test_one_locale ("C");
result |= test_one_locale ("tr_TR.UTF-8");
result |= test_one_locale ("tr_TR.ISO-8859-9");
return result;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"