Handle hexadecimal numbers with leading digit != 1 correctly and more than

one digit before decimal point.

diff --git a/stdlib/strtod.c b/stdlib/strtod.c
index 7502799edf9de88634b74148821bf6ad50490f50..f2ff79f6df4963906d2e6f7a9368b6b2b202ca9c 100644 (file)
--- a/stdlib/strtod.c
+++ b/stdlib/strtod.c
@@ -797,11 +797,15 @@ INTERNAL (STRTOF) (nptr, endptr, group LOCALE_PARAM)
 
       while (!ISXDIGIT (*startp))
        ++startp;
+      while (*startp == L_('0'))
+       ++startp;
       if (ISDIGIT (*startp))
        val = *startp++ - L_('0');
       else
        val = 10 + TOLOWER (*startp++) - L_('a');
       bits = nbits[val];
+      /* We cannot have a leading zero.  */
+      assert (bits != 0);
 
       if (pos + 1 >= 4 || pos + 1 >= bits)
        {
@@ -819,6 +823,9 @@ INTERNAL (STRTOF) (nptr, endptr, group LOCALE_PARAM)
          pos = BITS_PER_MP_LIMB - 1 - (bits - pos - 1);
        }
 
+      /* Adjust the exponent for the bits we are shifting in.  */
+      exponent += bits - 1 + (int_no - 1) * 4;
+
       while (--dig_no > 0 && idx >= 0)
        {
          while (!ISXDIGIT (*startp))