From 8489897e01b8a27c365c9c98b200ee25dc124cb4 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 21 Oct 2012 18:28:20 -0400 Subject: accept "nan(n-char-sequence)" in strtod/scanf functions this will prevent gnulib from wrapping our strtod to handle this useless feature. --- src/internal/floatscan.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/internal/floatscan.c b/src/internal/floatscan.c index bba5753b..08251213 100644 --- a/src/internal/floatscan.c +++ b/src/internal/floatscan.c @@ -414,7 +414,7 @@ static long double hexfloat(FILE *f, int bits, int emin, int sign, int pok) long double __floatscan(FILE *f, int prec, int pok) { int sign = 1; - int i; + size_t i; int bits; int emin; int c; @@ -455,6 +455,24 @@ long double __floatscan(FILE *f, int prec, int pok) if (!i) for (i=0; i<3 && (c|32)=="nan"[i]; i++) if (i<2) c = shgetc(f); if (i==3) { + if (shgetc(f) != '(') { + shunget(f); + return NAN; + } + for (i=1; ; i++) { + c = shgetc(f); + if (c-'0'<10U || c-'A'<26U || c-'a'<26U || c=='_') + continue; + if (c==')') return NAN; + shunget(f); + if (!pok) { + errno = EINVAL; + shlim(f, 0); + return 0; + } + while (i--) shunget(f); + return NAN; + } return NAN; } -- cgit v1.2.1