mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 02:03:35 +08:00
e02cabecf0
The nan* functions handle their string argument by constructing a NAN(...) string on the stack as a VLA and passing it to strtod functions. This approach has problems discussed in bug 16961 and bug 16962: the stack usage is unbounded, and it gives incorrect results in certain cases where the argument is not a valid n-char-sequence. The natural fix for both issues is to refactor the NaN payload parsing out of strtod into a separate function that the nan* functions can call directly, so that no temporary string needs constructing on the stack at all. This patch does that refactoring in preparation for fixing those bugs (but without actually using the new functions from nan* - which will also require exporting them from libc at version GLIBC_PRIVATE). This patch is not intended to change any user-visible behavior, so no tests are added (fixes for the above bugs will of course add tests for them). This patch builds on my recent fixes for strtol and strtod issues in Turkish locales. Given those fixes, the parsing of NaN payloads is locale-independent; thus, the new functions do not need to take a locale_t argument. Tested for x86_64, x86, mips64 and powerpc. * stdlib/strtod_nan.c: New file. * stdlib/strtod_nan_double.h: Likewise. * stdlib/strtod_nan_float.h: Likewise. * stdlib/strtod_nan_main.c: Likewise. * stdlib/strtod_nan_narrow.h: Likewise. * stdlib/strtod_nan_wide.h: Likewise. * stdlib/strtof_nan.c: Likewise. * stdlib/strtold_nan.c: Likewise. * sysdeps/ieee754/ldbl-128/strtod_nan_ldouble.h: Likewise. * sysdeps/ieee754/ldbl-128ibm/strtod_nan_ldouble.h: Likewise. * sysdeps/ieee754/ldbl-96/strtod_nan_ldouble.h: Likewise. * wcsmbs/wcstod_nan.c: Likewise. * wcsmbs/wcstof_nan.c: Likewise. * wcsmbs/wcstold_nan.c: Likewise. * stdlib/Makefile (routines): Add strtof_nan, strtod_nan and strtold_nan. * wcsmbs/Makefile (routines): Add wcstod_nan, wcstold_nan and wcstof_nan. * include/stdlib.h (__strtof_nan): Declare and use libc_hidden_proto. (__strtod_nan): Likewise. (__strtold_nan): Likewise. (__wcstof_nan): Likewise. (__wcstod_nan): Likewise. (__wcstold_nan): Likewise. * include/wchar.h (____wcstoull_l_internal): Declare. * stdlib/strtod_l.c: Do not include <ieee754.h>. (____strtoull_l_internal): Remove declaration. (STRTOF_NAN): Define macro. (SET_MANTISSA): Remove macro. (STRTOULL): Likewise. (____STRTOF_INTERNAL): Use STRTOF_NAN to parse NaN payload. * stdlib/strtof_l.c (____strtoull_l_internal): Remove declaration. (STRTOF_NAN): Define macro. (SET_MANTISSA): Remove macro. * sysdeps/ieee754/ldbl-128/strtold_l.c (STRTOF_NAN): Define macro. (SET_MANTISSA): Remove macro. * sysdeps/ieee754/ldbl-128ibm/strtold_l.c (STRTOF_NAN): Define macro. (SET_MANTISSA): Remove macro. * sysdeps/ieee754/ldbl-64-128/strtold_l.c (STRTOF_NAN): Define macro. (SET_MANTISSA): Remove macro. * sysdeps/ieee754/ldbl-96/strtold_l.c (STRTOF_NAN): Define macro. (SET_MANTISSA): Remove macro. * wcsmbs/wcstod_l.c (____wcstoull_l_internal): Remove declaration. * wcsmbs/wcstof_l.c (____wcstoull_l_internal): Likewise. * wcsmbs/wcstold_l.c (____wcstoull_l_internal): Likewise.
102 lines
3.6 KiB
Makefile
102 lines
3.6 KiB
Makefile
# Copyright (C) 1995-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/>.
|
|
|
|
#
|
|
# Sub-makefile for wcsmbs portion of the library.
|
|
#
|
|
subdir := wcsmbs
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := wchar.h bits/wchar.h bits/wchar2.h bits/wchar-ldbl.h uchar.h
|
|
|
|
routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \
|
|
wcsncmp wcsncpy wcspbrk wcsrchr wcsspn wcstok wcsstr wmemchr \
|
|
wmemcmp wmemcpy wmemmove wmemset wcpcpy wcpncpy wmempcpy \
|
|
btowc wctob mbsinit \
|
|
mbrlen mbrtowc wcrtomb mbsrtowcs wcsrtombs \
|
|
mbsnrtowcs wcsnrtombs wcsnlen wcschrnul \
|
|
wcstol wcstoul wcstoll wcstoull wcstod wcstold wcstof \
|
|
wcstol_l wcstoul_l wcstoll_l wcstoull_l \
|
|
wcstod_l wcstold_l wcstof_l \
|
|
wcstod_nan wcstold_nan wcstof_nan \
|
|
wcscoll wcsxfrm \
|
|
wcwidth wcswidth \
|
|
wcscoll_l wcsxfrm_l \
|
|
wcscasecmp wcsncase wcscasecmp_l wcsncase_l \
|
|
wcsmbsload mbsrtowcs_l \
|
|
isoc99_wscanf isoc99_vwscanf isoc99_fwscanf isoc99_vfwscanf \
|
|
isoc99_swscanf isoc99_vswscanf \
|
|
mbrtoc16 c16rtomb
|
|
|
|
strop-tests := wcscmp wcsncmp wmemcmp wcslen wcschr wcsrchr wcscpy wcsnlen \
|
|
wcpcpy wcsncpy wcpncpy wcscat wcsncat wcschrnul wcsspn wcspbrk \
|
|
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-wcstod-nan-locale \
|
|
$(addprefix test-,$(strop-tests))
|
|
|
|
include ../Rules
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 hr_HR.ISO-8859-2 \
|
|
ja_JP.EUC-JP zh_TW.EUC-TW tr_TR.UTF-8 tr_TR.ISO-8859-9
|
|
include ../gen-locales.mk
|
|
|
|
$(objpfx)tst-btowc.out: $(gen-locales)
|
|
$(objpfx)tst-c16c32-1.out: $(gen-locales)
|
|
$(objpfx)tst-mbrtowc.out: $(gen-locales)
|
|
$(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
|
|
CFLAGS-wcswidth.c = -I../wctype
|
|
|
|
strtox-CFLAGS = -I../include
|
|
CFLAGS-wcstol.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstoul.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstoll.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstoull.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstod.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstold.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstof.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstol_l.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstoul_l.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstoll_l.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstoull_l.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstod_l.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstold_l.c = $(strtox-CFLAGS)
|
|
CFLAGS-wcstof_l.c = $(strtox-CFLAGS)
|
|
CPPFLAGS-tst-wchar-h.c = -D_FORTIFY_SOURCE=2
|
|
|
|
CFLAGS-isoc99_wscanf.c += -fexceptions
|
|
CFLAGS-isoc99_fwscanf.c += -fexceptions
|
|
CFLAGS-isoc99_vwscanf.c += -fexceptions
|
|
CFLAGS-isoc99_vfwscanf.c += -fexceptions
|
|
|
|
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)
|