From a7f0c5ae4184916f0e145de3aefc794bf2e280ad Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 24 Nov 2015 22:21:59 +0000 Subject: Fix strtod ("NAN(I)") in Turkish locales (bug 19266). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The implementations of strtod and related functions use locale-specific conversions to lower case when parsing the contents of a string NAN(n-char-sequence_opt). This has the consequence that NAN(I) is not treated as being of that form (only the initial NAN part is accepted). The syntax of n-char-sequence directly maps to the ASCII letters, digits and underscore as in identifiers, so it is unambiguous that all ASCII letters must be accepted in all locales. This patch, relative to a tree with (pending review) applied and depending on that patch, fixes this problem by checking directly for ASCII letters. This will have the side effect of no longer accepting 'İ' (dotted 'I') inside NAN() in Turkish locales, which seems appropriate (that letter wouldn't have been interpreted as having any meaning in the NaN payload anyway, as not acceptable to strtoull). Tested for x86_64 and x86. [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). --- wcsmbs/Makefile | 5 ++++- wcsmbs/tst-wcstod-nan-locale.c | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 wcsmbs/tst-wcstod-nan-locale.c (limited to 'wcsmbs') diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index c1bb937..773cfdb 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 0000000..88dd842 --- /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 + . */ + +#define CHAR wchar_t +#define SFMT "L\"%ls\"" +#define FNPFX wcsto +#define L_(C) L ## C + +#include "../stdlib/tst-strtod-nan-locale-main.c" -- cgit v1.1