mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 09:01:07 +00:00
f5eee5c72b
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).
88 lines
2.6 KiB
C
88 lines
2.6 KiB
C
/* Test strtol functions work with all ASCII letters in Turkish
|
|
locales (bug 19242).
|
|
Copyright (C) 2015 Free Software Foundation, Inc.
|
|
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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#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"
|