diff options
author | Joseph Myers <joseph@codesourcery.com> | 2015-12-04 20:36:28 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2015-12-04 20:36:28 +0000 |
commit | 8f5e8b01a1da2a207228f2072c934fa5918554b8 (patch) | |
tree | c9d9d33b21af5a9df86f398d2d1fd6b42eee1e28 /math/test-nan-payload.c | |
parent | 79e0d340a9e7fb2c931686462131c92b99611003 (diff) | |
download | glibc-8f5e8b01a1da2a207228f2072c934fa5918554b8.tar glibc-8f5e8b01a1da2a207228f2072c934fa5918554b8.tar.gz glibc-8f5e8b01a1da2a207228f2072c934fa5918554b8.tar.bz2 glibc-8f5e8b01a1da2a207228f2072c934fa5918554b8.zip |
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.
Diffstat (limited to 'math/test-nan-payload.c')
-rw-r--r-- | math/test-nan-payload.c | 122 |
1 files changed, 122 insertions, 0 deletions
diff --git a/math/test-nan-payload.c b/math/test-nan-payload.c new file mode 100644 index 0000000000..358ff7199e --- /dev/null +++ b/math/test-nan-payload.c @@ -0,0 +1,122 @@ +/* Test nan functions payload handling (bug 16961). + 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 + <http://www.gnu.org/licenses/>. */ + +#include <float.h> +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +/* Avoid built-in functions. */ +#define WRAP_NAN(FUNC, STR) \ + ({ const char *volatile wns = (STR); FUNC (wns); }) +#define WRAP_STRTO(FUNC, STR) \ + ({ const char *volatile wss = (STR); FUNC (wss, NULL); }) + +#define CHECK_IS_NAN(TYPE, A) \ + do \ + { \ + if (isnan (A)) \ + puts ("PASS: " #TYPE " " #A); \ + else \ + { \ + puts ("FAIL: " #TYPE " " #A); \ + result = 1; \ + } \ + } \ + while (0) + +#define CHECK_SAME_NAN(TYPE, A, B) \ + do \ + { \ + if (memcmp (&(A), &(B), sizeof (A)) == 0) \ + puts ("PASS: " #TYPE " " #A " = " #B); \ + else \ + { \ + puts ("FAIL: " #TYPE " " #A " = " #B); \ + result = 1; \ + } \ + } \ + while (0) + +#define CHECK_DIFF_NAN(TYPE, A, B) \ + do \ + { \ + if (memcmp (&(A), &(B), sizeof (A)) != 0) \ + puts ("PASS: " #TYPE " " #A " != " #B); \ + else \ + { \ + puts ("FAIL: " #TYPE " " #A " != " #B); \ + result = 1; \ + } \ + } \ + while (0) + +/* Cannot test payloads by memcmp for formats where NaNs have padding + bits. */ +#define CAN_TEST_EQ(MANT_DIG) ((MANT_DIG) != 64 && (MANT_DIG) != 106) + +#define RUN_TESTS(TYPE, SFUNC, FUNC, MANT_DIG) \ + do \ + { \ + TYPE n123 = WRAP_NAN (FUNC, "123"); \ + CHECK_IS_NAN (TYPE, n123); \ + TYPE s123 = WRAP_STRTO (SFUNC, "NAN(123)"); \ + CHECK_IS_NAN (TYPE, s123); \ + TYPE n456 = WRAP_NAN (FUNC, "456"); \ + CHECK_IS_NAN (TYPE, n456); \ + TYPE s456 = WRAP_STRTO (SFUNC, "NAN(456)"); \ + CHECK_IS_NAN (TYPE, s456); \ + TYPE n123x = WRAP_NAN (FUNC, "123)"); \ + CHECK_IS_NAN (TYPE, n123x); \ + TYPE nemp = WRAP_NAN (FUNC, ""); \ + CHECK_IS_NAN (TYPE, nemp); \ + TYPE semp = WRAP_STRTO (SFUNC, "NAN()"); \ + CHECK_IS_NAN (TYPE, semp); \ + TYPE sx = WRAP_STRTO (SFUNC, "NAN"); \ + CHECK_IS_NAN (TYPE, sx); \ + if (CAN_TEST_EQ (MANT_DIG)) \ + CHECK_SAME_NAN (TYPE, n123, s123); \ + if (CAN_TEST_EQ (MANT_DIG)) \ + CHECK_SAME_NAN (TYPE, n456, s456); \ + if (CAN_TEST_EQ (MANT_DIG)) \ + CHECK_SAME_NAN (TYPE, nemp, semp); \ + if (CAN_TEST_EQ (MANT_DIG)) \ + CHECK_SAME_NAN (TYPE, n123x, sx); \ + CHECK_DIFF_NAN (TYPE, n123, n456); \ + CHECK_DIFF_NAN (TYPE, n123, nemp); \ + CHECK_DIFF_NAN (TYPE, n123, n123x); \ + CHECK_DIFF_NAN (TYPE, n456, nemp); \ + CHECK_DIFF_NAN (TYPE, n456, n123x); \ + } \ + while (0) + +static int +do_test (void) +{ + int result = 0; + RUN_TESTS (float, strtof, nanf, FLT_MANT_DIG); + RUN_TESTS (double, strtod, nan, DBL_MANT_DIG); +#ifndef NO_LONG_DOUBLE + RUN_TESTS (long double, strtold, nanl, LDBL_MANT_DIG); +#endif + return result; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |