aboutsummaryrefslogtreecommitdiff
path: root/stdlib
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-03-08 21:32:18 +0000
committerUlrich Drepper <drepper@redhat.com>2008-03-08 21:32:18 +0000
commitb3278554af25d7431fdf03388278e22b51578fab (patch)
treee0812eceff2ea558be508e66dbd8808ee35015fd /stdlib
parent2127a18634b03df94c69900765c3a44016251d93 (diff)
downloadglibc-b3278554af25d7431fdf03388278e22b51578fab.zip
glibc-b3278554af25d7431fdf03388278e22b51578fab.tar.gz
glibc-b3278554af25d7431fdf03388278e22b51578fab.tar.bz2
[BZ #5774]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Consume closing brace on NAN(...) sequence. * stdlib/Makefile (tests): Add tst-strtod6. * stdlib/tst-strtod6.c: New file. * inet/inet6_opt.c (inet6_opt_init): Check extlen for overflow.
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/Makefile2
-rw-r--r--stdlib/strtod_l.c3
-rw-r--r--stdlib/tst-strtod6.c53
3 files changed, 57 insertions, 1 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 6391781..1fe7f70 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -69,7 +69,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
test-a64l tst-qsort tst-system testmb2 bug-strtod2 \
tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2 \
- tst-makecontext2
+ tst-makecontext2 tst-strtod6
include ../Makeconfig
diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
index d1c2b62..9c2f86a 100644
--- a/stdlib/strtod_l.c
+++ b/stdlib/strtod_l.c
@@ -594,6 +594,9 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
mant = STRTOULL (startp + 1, &endp, 0);
if (endp == cp)
SET_MANTISSA (retval, mant);
+
+ /* Consume the closing brace. */
+ ++cp;
}
}
diff --git a/stdlib/tst-strtod6.c b/stdlib/tst-strtod6.c
new file mode 100644
index 0000000..fdb104f
--- /dev/null
+++ b/stdlib/tst-strtod6.c
@@ -0,0 +1,53 @@
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static int
+do_test (void)
+{
+ static const char str[] = "NaN(blabla)something";
+ char *endp;
+ int result = 0;
+
+ double d = strtod (str, &endp);
+ if (!isnan (d))
+ {
+ puts ("strtod did not return NAN");
+ result = 1;
+ }
+ if (strcmp (endp, "something") != 0)
+ {
+ puts ("strtod set incorrect end pointer");
+ result = 1;
+ }
+
+ float f = strtof (str, &endp);
+ if (!isnanf (f))
+ {
+ puts ("strtof did not return NAN");
+ result = 1;
+ }
+ if (strcmp (endp, "something") != 0)
+ {
+ puts ("strtof set incorrect end pointer");
+ result = 1;
+ }
+
+ long double ld = strtold (str, &endp);
+ if (!isnan (ld))
+ {
+ puts ("strtold did not return NAN");
+ result = 1;
+ }
+ if (strcmp (endp, "something") != 0)
+ {
+ puts ("strtold set incorrect end pointer");
+ result = 1;
+ }
+
+ return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"