2008-03-08 Ulrich Drepper <drepper@redhat.com>
+ [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.
+
[BZ #5762]
* posix/getopt.c (_getopt_internal_r): Clarify error message by
putting offending option character in quotes. Clean up error
{
if (extbuf != NULL)
{
- if (extlen <= 0 || (extlen % 8) != 0)
+ if (extlen <= 0 || (extlen % 8) != 0 || extlen > 256 * 8)
return -1;
/* Fill in the length in units of 8 octets. */
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
mant = STRTOULL (startp + 1, &endp, 0);
if (endp == cp)
SET_MANTISSA (retval, mant);
+
+ /* Consume the closing brace. */
+ ++cp;
}
}
--- /dev/null
+#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"