mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-18 12:16:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

[BZ #3855]

Browse Source 
* stdlib/strtod_l.c (____STRTOF_INTERNAL): 0x. not followed by
	hexadecimal digit should accept just the initial 0.
	* stdlib/tst-strtod2.c (tests): New variable.
	(do_test): Run several tests rather than just one.

2007-01-11  Jakub Jelinek  <jakub@redhat.com>
This commit is contained in:
Ulrich Drepper 2007-01-11 17:28:58 +00:00
parent 66193697e0
commit 43b9d65740
3 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-01-11 Jakub Jelinek <jakub@redhat.com>
[BZ #3855]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): 0x. not followed by
hexadecimal digit should accept just the initial 0.
* stdlib/tst-strtod2.c (tests): New variable.
(do_test): Run several tests rather than just one.
2007-01-11 Jakub Jelinek <jakub@redhat.com> 2007-01-11 Jakub Jelinek <jakub@redhat.com>
* sysdeps/i386/soft-fp/sfp-machine.h: Remove. * sysdeps/i386/soft-fp/sfp-machine.h: Remove.

16
stdlib/strtod_l.c
View File

@ -1,5 +1,6 @@
/* Convert string representing a number to float value, using given locale. /* Convert string representing a number to float value, using given locale.
Copyright (C) 1997,1998,2002,2004,2005,2006 Free Software Foundation, Inc. Copyright (C) 1997,1998,2002,2004,2005,2006,2007
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@ -665,14 +666,23 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
if (!((c >= L_('0') && c <= L_('9')) if (!((c >= L_('0') && c <= L_('9'))
|| (base == 16 && ((CHAR_TYPE) TOLOWER (c) >= L_('a') || (base == 16 && ((CHAR_TYPE) TOLOWER (c) >= L_('a')
&& (CHAR_TYPE) TOLOWER (c) <= L_('f'))) && (CHAR_TYPE) TOLOWER (c) <= L_('f')))
|| (
#ifdef USE_WIDE_CHAR #ifdef USE_WIDE_CHAR
|| c == (wint_t) decimal c == (wint_t) decimal
#else #else
|| ({ for (cnt = 0; decimal[cnt] != '\0'; ++cnt) ({ for (cnt = 0; decimal[cnt] != '\0'; ++cnt)
if (decimal[cnt] != cp[cnt]) if (decimal[cnt] != cp[cnt])
break; break;
decimal[cnt] == '\0'; }) decimal[cnt] == '\0'; })
#endif #endif
/* '0x.' alone is not a valid hexadecimal number.
'.' alone is not valid either, but that has been checked
already earlier. */
&& (base != 16
|| cp != start_of_digits
|| (cp[decimal_len] >= L_('0') && cp[decimal_len] <= L_('9'))
|| ((CHAR_TYPE) TOLOWER (cp[decimal_len]) >= L_('a')
&& (CHAR_TYPE) TOLOWER (cp[decimal_len]) <= L_('f'))))
|| (base == 16 && (cp != start_of_digits || (base == 16 && (cp != start_of_digits
&& (CHAR_TYPE) TOLOWER (c) == L_('p'))) && (CHAR_TYPE) TOLOWER (c) == L_('p')))
|| (base != 16 && (CHAR_TYPE) TOLOWER (c) == L_('e')))) || (base != 16 && (CHAR_TYPE) TOLOWER (c) == L_('e'))))

33
stdlib/tst-strtod2.c
View File

@ -1,23 +1,42 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
struct test
{
const char *str;
double result;
size_t offset;
} tests[] =
{
{ "0xy", 0.0, 1 },
{ "0x.y", 0.0, 1 },
{ "0x0.y", 0.0, 4 },
{ "0x.0y", 0.0, 4 },
{ ".y", 0.0, 0 },
{ "0.y", 0.0, 2 },
{ ".0y", 0.0, 2 }
};
static int static int
do_test (void) do_test (void)
{ {
int status = 0; int status = 0;
const char s[] = "0x"; for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
char *ep;
double r = strtod (s, &ep);
if (r != 0)
{ {
printf ("r = %g, expect 0\n", r); char *ep;
double r = strtod (tests[i].str, &ep);
if (r != tests[i].result)
{
printf ("test %zu r = %g, expect %g\n", i, r, tests[i].result);
status = 1; status = 1;
} }
if (ep != s + 1) if (ep != tests[i].str + tests[i].offset)
{ {
printf ("strtod parsed %ju characters, expected 1\n", ep - s); printf ("test %zu strtod parsed %ju characters, expected %zu\n",
i, ep - tests[i].str, tests[i].offset);
status = 1; status = 1;
} }
}
return status; return status;
} }