* stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix handling of multi-byte

	thousands separators.
	* stdlib/Makefile: Add rules to build and run tst-strtod4.
	* stdlib/tst-strtod4.c: New test.

	[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.

diff --git a/ChangeLog b/ChangeLog
index 15408da2bab129829e82a0ce6c62f0e9831b9f9c..ecdab99e3c010927e8f92aa8ad065dfeab1a7ebd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-01-11  Jakub Jelinek  <jakub@redhat.com>
+
+       * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix handling of multi-byte
+       thousands separators.
+       * stdlib/Makefile: Add rules to build and run tst-strtod4.
+       * stdlib/tst-strtod4.c: New test.
+
+       [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-03  Ulrich Drepper  <drepper@redhat.com>
 
        * stdlib/Makefile (tst-strtod3-ENV): Define.

diff --git a/stdlib/Makefile b/stdlib/Makefile
index c5a2cbd066eff581ed1a8b0c9b1cef649700f0ce..ecda85b0dd163ea1497faaa6db30238b674f3fbe 100644 (file)
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -68,7 +68,7 @@ tests         := tst-strtol tst-strtod testmb testrand testsort testdiv   \
                   tst-limits tst-rand48 bug-strtod tst-setcontext          \
                   test-a64l tst-qsort tst-system testmb2 bug-strtod2       \
                   tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
-                  tst-makecontext
+                  tst-makecontext tst-strtod4
 
 include ../Makeconfig
 
@@ -118,6 +118,7 @@ test-canon-ARGS = --test-dir=${common-objpfx}stdlib
 
 tst-strtod-ENV = LOCPATH=$(common-objpfx)localedata
 tst-strtod3-ENV = LOCPATH=$(common-objpfx)localedata
+tst-strtod4-ENV = LOCPATH=$(common-objpfx)localedata
 testmb2-ENV = LOCPATH=$(common-objpfx)localedata
 
 # Run a test on the header files we use.

diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
index b4e4819c87b0234f6fa1065fbd7226be428df36c..bb7493bff01ce6f8d8585d0a16b94e7a6ac1d358 100644 (file)
--- a/stdlib/strtod_l.c
+++ b/stdlib/strtod_l.c
@@ -1,5 +1,6 @@
 /* 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.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -650,10 +651,11 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
          if (c != '0')
            {
              for (cnt = 0; thousands[cnt] != '\0'; ++cnt)
-               if (c != thousands[cnt])
+               if (thousands[cnt] != cp[cnt])
                  break;
              if (thousands[cnt] != '\0')
                break;
+             cp += cnt - 1;
            }
          c = *++cp;
        }
@@ -665,14 +667,23 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
   if (!((c >= L_('0') && c <= L_('9'))
        || (base == 16 && ((CHAR_TYPE) TOLOWER (c) >= L_('a')
                           && (CHAR_TYPE) TOLOWER (c) <= L_('f')))
+       || (
 #ifdef USE_WIDE_CHAR
-       || c == (wint_t) decimal
+           c == (wint_t) decimal
 #else
-       || ({ for (cnt = 0; decimal[cnt] != '\0'; ++cnt)
-             if (decimal[cnt] != cp[cnt])
-               break;
-             decimal[cnt] == '\0'; })
+           ({ for (cnt = 0; decimal[cnt] != '\0'; ++cnt)
+                if (decimal[cnt] != cp[cnt])
+                  break;
+              decimal[cnt] == '\0'; })
 #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
                           && (CHAR_TYPE) TOLOWER (c) == L_('p')))
        || (base != 16 && (CHAR_TYPE) TOLOWER (c) == L_('e'))))
@@ -715,6 +726,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
                  break;
              if (thousands[cnt] != '\0')
                break;
+             cp += cnt - 1;
            }
 #endif
        }

diff --git a/stdlib/tst-strtod2.c b/stdlib/tst-strtod2.c
index 925ea9cafab60f824814d927e16d997d842749c1..30d8d9df6535089f2f5114a9d7d15ba92f59a2db 100644 (file)
--- a/stdlib/tst-strtod2.c
+++ b/stdlib/tst-strtod2.c
@@ -1,22 +1,41 @@
 #include <stdio.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
 do_test (void)
 {
   int status = 0;
-  const char s[] = "0x";
-  char *ep;
-  double r = strtod (s, &ep);
-  if (r != 0)
-    {
-      printf ("r = %g, expect 0\n", r);
-      status = 1;
-    }
-  if (ep != s + 1)
+  for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
     {
-      printf ("strtod parsed %ju characters, expected 1\n", ep - s);
-      status = 1;
+      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;
+       }
+      if (ep != tests[i].str + tests[i].offset)
+       {
+         printf ("test %zu strtod parsed %ju characters, expected %zu\n",
+                 i, ep - tests[i].str, tests[i].offset);
+         status = 1;
+       }
     }
   return status;
 }