From 8f5e8b01a1da2a207228f2072c934fa5918554b8 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 4 Dec 2015 20:36:28 +0000 Subject: Fix nan functions handling of payload strings (bug 16961, bug 16962). The nan, nanf and nanl functions handle payload strings by doing e.g.: if (tagp[0] != '\0') { char buf[6 + strlen (tagp)]; sprintf (buf, "NAN(%s)", tagp); return strtod (buf, NULL); } This is an unbounded stack allocation based on the length of the argument. Furthermore, if the argument starts with an n-char-sequence followed by ')', that n-char-sequence is wrongly treated as significant for determining the payload of the resulting NaN, when ISO C says the call should be equivalent to strtod ("NAN", NULL), without being affected by that initial n-char-sequence. This patch fixes both those problems by using the __strtod_nan etc. functions recently factored out of strtod etc. for that purpose, with those functions being exported from libc at version GLIBC_PRIVATE. Tested for x86_64, x86, mips64 and powerpc. [BZ #16961] [BZ #16962] * math/s_nan.c (__nan): Use __strtod_nan instead of constructing a string on the stack for strtod. * math/s_nanf.c (__nanf): Use __strtof_nan instead of constructing a string on the stack for strtof. * math/s_nanl.c (__nanl): Use __strtold_nan instead of constructing a string on the stack for strtold. * stdlib/Versions (libc): Add __strtof_nan, __strtod_nan and __strtold_nan to GLIBC_PRIVATE. * math/test-nan-overflow.c: New file. * math/test-nan-payload.c: Likewise. * math/Makefile (tests): Add test-nan-overflow and test-nan-payload. --- stdlib/Versions | 1 + 1 file changed, 1 insertion(+) (limited to 'stdlib/Versions') diff --git a/stdlib/Versions b/stdlib/Versions index f1777dfcf4..60b628d47a 100644 --- a/stdlib/Versions +++ b/stdlib/Versions @@ -118,5 +118,6 @@ libc { # Used from other libraries __libc_secure_getenv; __call_tls_dtors; + __strtof_nan; __strtod_nan; __strtold_nan; } } -- cgit v1.2.3