AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BZ #5774]

Browse Source 
* 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.
This commit is contained in:
Ulrich Drepper 2008-03-08 21:32:18 +00:00
parent 2127a18634
commit b3278554af
5 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,13 @@
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

2
inet/inet6_opt.c
View File

@ -34,7 +34,7 @@ inet6_opt_init (void *extbuf, socklen_t extlen)
{
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. */

2
stdlib/Makefile
View File

@ -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

3
stdlib/strtod_l.c
View File

@ -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;
}
}

53
stdlib/tst-strtod6.c Normal file
View File

@ -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"