mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00: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.
275 lines
9.6 KiB
C
275 lines
9.6 KiB
C
#ifndef _STDLIB_H
|
|
|
|
#ifdef __need_malloc_and_calloc
|
|
#define __Need_M_And_C
|
|
#endif
|
|
|
|
#ifndef _ISOMAC
|
|
# include <stddef.h>
|
|
#endif
|
|
#include <stdlib/stdlib.h>
|
|
|
|
/* Now define the internal interfaces. */
|
|
#if !defined __Need_M_And_C && !defined _ISOMAC
|
|
# include <sys/stat.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
extern __typeof (strtol_l) __strtol_l;
|
|
extern __typeof (strtoul_l) __strtoul_l;
|
|
extern __typeof (strtoll_l) __strtoll_l;
|
|
extern __typeof (strtoull_l) __strtoull_l;
|
|
extern __typeof (strtod_l) __strtod_l;
|
|
extern __typeof (strtof_l) __strtof_l;
|
|
extern __typeof (strtold_l) __strtold_l;
|
|
libc_hidden_proto (__strtol_l)
|
|
libc_hidden_proto (__strtoul_l)
|
|
libc_hidden_proto (__strtoll_l)
|
|
libc_hidden_proto (__strtoull_l)
|
|
libc_hidden_proto (__strtod_l)
|
|
libc_hidden_proto (__strtof_l)
|
|
libc_hidden_proto (__strtold_l)
|
|
|
|
libc_hidden_proto (exit)
|
|
libc_hidden_proto (abort)
|
|
libc_hidden_proto (getenv)
|
|
extern __typeof (secure_getenv) __libc_secure_getenv;
|
|
libc_hidden_proto (__libc_secure_getenv)
|
|
libc_hidden_proto (bsearch)
|
|
libc_hidden_proto (qsort)
|
|
extern __typeof (qsort_r) __qsort_r;
|
|
libc_hidden_proto (__qsort_r)
|
|
libc_hidden_proto (lrand48_r)
|
|
libc_hidden_proto (wctomb)
|
|
|
|
extern long int __random (void);
|
|
extern void __srandom (unsigned int __seed);
|
|
extern char *__initstate (unsigned int __seed, char *__statebuf,
|
|
size_t __statelen);
|
|
extern char *__setstate (char *__statebuf);
|
|
extern int __random_r (struct random_data *__buf, int32_t *__result);
|
|
extern int __srandom_r (unsigned int __seed, struct random_data *__buf);
|
|
extern int __initstate_r (unsigned int __seed, char *__statebuf,
|
|
size_t __statelen, struct random_data *__buf);
|
|
extern int __setstate_r (char *__statebuf, struct random_data *__buf);
|
|
extern int __rand_r (unsigned int *__seed);
|
|
extern int __erand48_r (unsigned short int __xsubi[3],
|
|
struct drand48_data *__buffer, double *__result);
|
|
extern int __nrand48_r (unsigned short int __xsubi[3],
|
|
struct drand48_data *__buffer,
|
|
long int *__result);
|
|
extern int __jrand48_r (unsigned short int __xsubi[3],
|
|
struct drand48_data *__buffer,
|
|
long int *__result);
|
|
extern int __srand48_r (long int __seedval,
|
|
struct drand48_data *__buffer);
|
|
extern int __seed48_r (unsigned short int __seed16v[3],
|
|
struct drand48_data *__buffer);
|
|
extern int __lcong48_r (unsigned short int __param[7],
|
|
struct drand48_data *__buffer);
|
|
|
|
/* Internal function to compute next state of the generator. */
|
|
extern int __drand48_iterate (unsigned short int __xsubi[3],
|
|
struct drand48_data *__buffer);
|
|
|
|
/* Global state for non-reentrant functions. Defined in drand48-iter.c. */
|
|
extern struct drand48_data __libc_drand48_data attribute_hidden;
|
|
|
|
extern int __setenv (const char *__name, const char *__value, int __replace);
|
|
extern int __unsetenv (const char *__name);
|
|
extern int __clearenv (void);
|
|
extern char *__mktemp (char *__template) __THROW __nonnull ((1));
|
|
extern char *__canonicalize_file_name (const char *__name);
|
|
extern char *__realpath (const char *__name, char *__resolved);
|
|
extern int __ptsname_r (int __fd, char *__buf, size_t __buflen);
|
|
# ifndef _ISOMAC
|
|
extern int __ptsname_internal (int fd, char *buf, size_t buflen,
|
|
struct stat64 *stp);
|
|
# endif
|
|
extern int __getpt (void);
|
|
extern int __posix_openpt (int __oflag);
|
|
|
|
extern int __add_to_environ (const char *name, const char *value,
|
|
const char *combines, int replace);
|
|
|
|
extern void _quicksort (void *const pbase, size_t total_elems,
|
|
size_t size, __compar_d_fn_t cmp, void *arg);
|
|
|
|
extern int __on_exit (void (*__func) (int __status, void *__arg), void *__arg);
|
|
|
|
extern int __cxa_atexit (void (*func) (void *), void *arg, void *d);
|
|
libc_hidden_proto (__cxa_atexit);
|
|
|
|
extern int __cxa_thread_atexit_impl (void (*func) (void *), void *arg,
|
|
void *d);
|
|
extern void __call_tls_dtors (void)
|
|
#ifndef SHARED
|
|
__attribute__ ((weak))
|
|
#endif
|
|
;
|
|
libc_hidden_proto (__call_tls_dtors)
|
|
|
|
extern void __cxa_finalize (void *d);
|
|
|
|
extern int __posix_memalign (void **memptr, size_t alignment, size_t size);
|
|
|
|
extern void *__libc_memalign (size_t alignment, size_t size)
|
|
__attribute_malloc__;
|
|
|
|
extern int __libc_system (const char *line);
|
|
|
|
|
|
extern double __strtod_internal (const char *__restrict __nptr,
|
|
char **__restrict __endptr, int __group)
|
|
__THROW __nonnull ((1)) __wur;
|
|
extern float __strtof_internal (const char *__restrict __nptr,
|
|
char **__restrict __endptr, int __group)
|
|
__THROW __nonnull ((1)) __wur;
|
|
extern long double __strtold_internal (const char *__restrict __nptr,
|
|
char **__restrict __endptr,
|
|
int __group)
|
|
__THROW __nonnull ((1)) __wur;
|
|
extern long int __strtol_internal (const char *__restrict __nptr,
|
|
char **__restrict __endptr,
|
|
int __base, int __group)
|
|
__THROW __nonnull ((1)) __wur;
|
|
extern unsigned long int __strtoul_internal (const char *__restrict __nptr,
|
|
char **__restrict __endptr,
|
|
int __base, int __group)
|
|
__THROW __nonnull ((1)) __wur;
|
|
__extension__
|
|
extern long long int __strtoll_internal (const char *__restrict __nptr,
|
|
char **__restrict __endptr,
|
|
int __base, int __group)
|
|
__THROW __nonnull ((1)) __wur;
|
|
__extension__
|
|
extern unsigned long long int __strtoull_internal (const char *
|
|
__restrict __nptr,
|
|
char **__restrict __endptr,
|
|
int __base, int __group)
|
|
__THROW __nonnull ((1)) __wur;
|
|
libc_hidden_proto (__strtof_internal)
|
|
libc_hidden_proto (__strtod_internal)
|
|
libc_hidden_proto (__strtold_internal)
|
|
libc_hidden_proto (__strtol_internal)
|
|
libc_hidden_proto (__strtoll_internal)
|
|
libc_hidden_proto (__strtoul_internal)
|
|
libc_hidden_proto (__strtoull_internal)
|
|
|
|
extern double ____strtod_l_internal (const char *__restrict __nptr,
|
|
char **__restrict __endptr, int __group,
|
|
__locale_t __loc);
|
|
extern float ____strtof_l_internal (const char *__restrict __nptr,
|
|
char **__restrict __endptr, int __group,
|
|
__locale_t __loc);
|
|
extern long double ____strtold_l_internal (const char *__restrict __nptr,
|
|
char **__restrict __endptr,
|
|
int __group, __locale_t __loc);
|
|
extern long int ____strtol_l_internal (const char *__restrict __nptr,
|
|
char **__restrict __endptr,
|
|
int __base, int __group,
|
|
__locale_t __loc);
|
|
extern unsigned long int ____strtoul_l_internal (const char *
|
|
__restrict __nptr,
|
|
char **__restrict __endptr,
|
|
int __base, int __group,
|
|
__locale_t __loc);
|
|
__extension__
|
|
extern long long int ____strtoll_l_internal (const char *__restrict __nptr,
|
|
char **__restrict __endptr,
|
|
int __base, int __group,
|
|
__locale_t __loc);
|
|
__extension__
|
|
extern unsigned long long int ____strtoull_l_internal (const char *
|
|
__restrict __nptr,
|
|
char **
|
|
__restrict __endptr,
|
|
int __base, int __group,
|
|
__locale_t __loc);
|
|
|
|
libc_hidden_proto (____strtof_l_internal)
|
|
libc_hidden_proto (____strtod_l_internal)
|
|
libc_hidden_proto (____strtold_l_internal)
|
|
libc_hidden_proto (____strtol_l_internal)
|
|
libc_hidden_proto (____strtoll_l_internal)
|
|
libc_hidden_proto (____strtoul_l_internal)
|
|
libc_hidden_proto (____strtoull_l_internal)
|
|
|
|
libc_hidden_proto (strtof)
|
|
libc_hidden_proto (strtod)
|
|
libc_hidden_proto (strtold)
|
|
libc_hidden_proto (strtol)
|
|
libc_hidden_proto (strtoll)
|
|
libc_hidden_proto (strtoul)
|
|
libc_hidden_proto (strtoull)
|
|
|
|
extern float __strtof_nan (const char *, char **, char) internal_function;
|
|
extern double __strtod_nan (const char *, char **, char) internal_function;
|
|
extern long double __strtold_nan (const char *, char **, char)
|
|
internal_function;
|
|
extern float __wcstof_nan (const wchar_t *, wchar_t **, wchar_t)
|
|
internal_function;
|
|
extern double __wcstod_nan (const wchar_t *, wchar_t **, wchar_t)
|
|
internal_function;
|
|
extern long double __wcstold_nan (const wchar_t *, wchar_t **, wchar_t)
|
|
internal_function;
|
|
|
|
libc_hidden_proto (__strtof_nan)
|
|
libc_hidden_proto (__strtod_nan)
|
|
libc_hidden_proto (__strtold_nan)
|
|
libc_hidden_proto (__wcstof_nan)
|
|
libc_hidden_proto (__wcstod_nan)
|
|
libc_hidden_proto (__wcstold_nan)
|
|
|
|
extern char *__ecvt (double __value, int __ndigit, int *__restrict __decpt,
|
|
int *__restrict __sign);
|
|
extern char *__fcvt (double __value, int __ndigit, int *__restrict __decpt,
|
|
int *__restrict __sign);
|
|
extern char *__gcvt (double __value, int __ndigit, char *__buf);
|
|
extern int __ecvt_r (double __value, int __ndigit, int *__restrict __decpt,
|
|
int *__restrict __sign, char *__restrict __buf,
|
|
size_t __len);
|
|
extern int __fcvt_r (double __value, int __ndigit, int *__restrict __decpt,
|
|
int *__restrict __sign, char *__restrict __buf,
|
|
size_t __len);
|
|
extern char *__qecvt (long double __value, int __ndigit,
|
|
int *__restrict __decpt, int *__restrict __sign);
|
|
extern char *__qfcvt (long double __value, int __ndigit,
|
|
int *__restrict __decpt, int *__restrict __sign);
|
|
extern char *__qgcvt (long double __value, int __ndigit, char *__buf);
|
|
extern int __qecvt_r (long double __value, int __ndigit,
|
|
int *__restrict __decpt, int *__restrict __sign,
|
|
char *__restrict __buf, size_t __len);
|
|
extern int __qfcvt_r (long double __value, int __ndigit,
|
|
int *__restrict __decpt, int *__restrict __sign,
|
|
char *__restrict __buf, size_t __len);
|
|
|
|
# if IS_IN (libc)
|
|
# undef MB_CUR_MAX
|
|
# define MB_CUR_MAX (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX))
|
|
# endif
|
|
|
|
extern void *__default_morecore (ptrdiff_t) __THROW;
|
|
libc_hidden_proto (__default_morecore)
|
|
|
|
struct abort_msg_s
|
|
{
|
|
unsigned int size;
|
|
char msg[0];
|
|
};
|
|
extern struct abort_msg_s *__abort_msg;
|
|
libc_hidden_proto (__abort_msg)
|
|
|
|
# if IS_IN (rtld)
|
|
extern __typeof (unsetenv) unsetenv attribute_hidden;
|
|
extern __typeof (__strtoul_internal) __strtoul_internal attribute_hidden;
|
|
# endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif
|
|
|
|
#undef __Need_M_And_C
|
|
|
|
#endif /* include/stdlib.h */
|