diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | stdlib/Makefile | 4 | ||||
| -rw-r--r-- | stdlib/strtod_l.c | 4 | ||||
| -rw-r--r-- | stdlib/tst-strtod-nan-locale-main.c | 89 | ||||
| -rw-r--r-- | stdlib/tst-strtod-nan-locale.c | 25 | ||||
| -rw-r--r-- | wcsmbs/Makefile | 5 | ||||
| -rw-r--r-- | wcsmbs/tst-wcstod-nan-locale.c | 25 |
7 files changed, 165 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index c8700d21da..78ba1f9c19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2015-11-24 Joseph Myers <joseph@codesourcery.com> + + [BZ #19266] + * stdlib/strtod_l.c (____STRTOF_INTERNAL): Check directly for + upper case and lower case letters inside NAN(), not using TOLOWER. + * stdlib/tst-strtod-nan-locale-main.c: New file. + * stdlib/tst-strtod-nan-locale.c: Likewise. + * stdlib/Makefile (tests): Add tst-strtod-nan-locale. + [$(run-built-tests) = yes] ($(objpfx)tst-strtod-nan-locale.out): + Depend on $(gen-locales). + ($(objpfx)tst-strtod-nan-locale): Depend on $(libm). + * wcsmbs/tst-wcstod-nan-locale.c: New file. + * wcsmbs/Makefile (tests): Add tst-wcstod-nan-locale. + [$(run-built-tests) = yes] ($(objpfx)tst-wcstod-nan-locale.out): + Depend on $(gen-locales). + ($(objpfx)tst-wcstod-nan-locale): Depend on $(libm). + 2015-11-24 Chris Metcalf <cmetcalf@ezchip.com> * misc/tst-tsearch.c (TIMEOUT): Set to 10. diff --git a/stdlib/Makefile b/stdlib/Makefile index e8b5b8cc1b..10d9406813 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -75,7 +75,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ tst-secure-getenv tst-strtod-overflow tst-strtod-round \ tst-tininess tst-strtod-underflow tst-tls-atexit \ tst-setcontext3 tst-tls-atexit-nodelete \ - tst-strtol-locale + tst-strtol-locale tst-strtod-nan-locale tests-static := tst-secure-getenv modules-names = tst-tls-atexit-lib @@ -134,6 +134,7 @@ $(objpfx)tst-strtod3.out: $(gen-locales) $(objpfx)tst-strtod4.out: $(gen-locales) $(objpfx)tst-strtod5.out: $(gen-locales) $(objpfx)tst-strtol-locale.out: $(gen-locales) +$(objpfx)tst-strtod-nan-locale.out: $(gen-locales) endif # Testdir has to be named stdlib and needs to be writable @@ -168,6 +169,7 @@ $(objpfx)tst-strtod-round: $(libm) $(objpfx)tst-tininess: $(libm) $(objpfx)tst-strtod-underflow: $(libm) $(objpfx)tst-strtod6: $(libm) +$(objpfx)tst-strtod-nan-locale: $(libm) tst-tls-atexit-lib.so-no-z-defs = yes diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c index 89e03841ee..7307d98b24 100644 --- a/stdlib/strtod_l.c +++ b/stdlib/strtod_l.c @@ -652,8 +652,8 @@ ____STRTOF_INTERNAL (const STRING_TYPE *nptr, STRING_TYPE **endptr, int group, do ++cp; while ((*cp >= L_('0') && *cp <= L_('9')) - || ({ CHAR_TYPE lo = TOLOWER (*cp); - lo >= L_('a') && lo <= L_('z'); }) + || (*cp >= L_('A') && *cp <= L_('Z')) + || (*cp >= L_('a') && *cp <= L_('z')) || *cp == L_('_')); if (*cp != L_(')')) diff --git a/stdlib/tst-strtod-nan-locale-main.c b/stdlib/tst-strtod-nan-locale-main.c new file mode 100644 index 0000000000..84a46904a1 --- /dev/null +++ b/stdlib/tst-strtod-nan-locale-main.c @@ -0,0 +1,89 @@ +/* Test strtod functions work with all ASCII letters in NAN(...) in + Turkish locales (bug 19266). + 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 <math.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, FN, TYPE) \ + do \ + { \ + CHAR *ep; \ + TYPE val = FNX (FN) (STR, &ep); \ + if (isnan (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[7]; + s[0] = L_('N'); + s[1] = L_('A'); + s[2] = L_('N'); + s[3] = L_('('); + s[4] = L_('A') + i - 10; + s[5] = L_(')'); + s[6] = 0; + TEST (loc, s, f, float); + TEST (loc, s, d, double); + TEST (loc, s, ld, long double); + s[4] = L_('a') + i - 10; + TEST (loc, s, f, float); + TEST (loc, s, d, double); + TEST (loc, s, ld, long double); + } + 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" diff --git a/stdlib/tst-strtod-nan-locale.c b/stdlib/tst-strtod-nan-locale.c new file mode 100644 index 0000000000..b65f7c0904 --- /dev/null +++ b/stdlib/tst-strtod-nan-locale.c @@ -0,0 +1,25 @@ +/* Test strtod functions work with all ASCII letters in NAN(...) in + Turkish locales (bug 19266). Narrow string version. + 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/>. */ + +#define CHAR char +#define SFMT "\"%s\"" +#define FNPFX strto +#define L_(C) C + +#include <tst-strtod-nan-locale-main.c> diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index c1bb9375b7..773cfdb932 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -47,7 +47,7 @@ strop-tests := wcscmp wcsncmp wmemcmp wcslen wcschr wcsrchr wcscpy wcsnlen \ wcscspn wmemchr wmemset tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \ tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \ - tst-c16c32-1 wcsatcliff tst-wcstol-locale \ + tst-c16c32-1 wcsatcliff tst-wcstol-locale tst-wcstod-nan-locale \ $(addprefix test-,$(strop-tests)) include ../Rules @@ -64,6 +64,7 @@ $(objpfx)tst-mbrtowc2.out: $(gen-locales) $(objpfx)tst-wcrtomb.out: $(gen-locales) $(objpfx)wcsmbs-tst1.out: $(gen-locales) $(objpfx)tst-wcstol-locale.out: $(gen-locales) +$(objpfx)tst-wcstod-nan-locale.out: $(gen-locales) endif CFLAGS-wcwidth.c = -I../wctype @@ -95,3 +96,5 @@ CPPFLAGS += $(libio-mtsafe) # We need to find the default version of strtold_l in stdlib. CPPFLAGS-wcstold_l.c = -I../stdlib + +$(objpfx)tst-wcstod-nan-locale: $(libm) diff --git a/wcsmbs/tst-wcstod-nan-locale.c b/wcsmbs/tst-wcstod-nan-locale.c new file mode 100644 index 0000000000..88dd8428a4 --- /dev/null +++ b/wcsmbs/tst-wcstod-nan-locale.c @@ -0,0 +1,25 @@ +/* Test strtod functions work with all ASCII letters in NAN(...) in + Turkish locales (bug 19266). Wide string version. + 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/>. */ + +#define CHAR wchar_t +#define SFMT "L\"%ls\"" +#define FNPFX wcsto +#define L_(C) L ## C + +#include "../stdlib/tst-strtod-nan-locale-main.c" |