strtod.c (_strtod_r): Logic to check for missing digits after exponent had 'else...

	* strtod.c (_strtod_r):  Logic to check for missing digits
	after exponent had 'else' attached to wrong 'if'.

From-SVN: r46132

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7027fa9b0bc39c087adefa3a6422b7c00c0cc6b1..6807a7b0fff7b745c8e59cf29ee8860df292e686 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Per Bothner  <per@bothner.com>
+
+       * strtod.c (_strtod_r):  Logic to check for missing digits
+       after exponent had 'else' attached to wrong 'if'.
+
 2001-10-09  Mark Wielaard  <mark@klomp.org>
 
        * java/net/SocketImpl.java: Merge with Classpath

diff --git a/libjava/java/lang/strtod.c b/libjava/java/lang/strtod.c
index e0e8e74828bfb9ab17b2b524f2e8df2a697e84cc..1777b1aae8af97b67fb70a32f90d1881e458b32a 100644 (file)
--- a/libjava/java/lang/strtod.c
+++ b/libjava/java/lang/strtod.c
@@ -242,16 +242,15 @@ dig_done:
              if (esign)
                e = -e;
            }
-         else
-           {
-             /* No exponent after an 'E' : that's an error. */
-             ptr->_errno = EINVAL;
-             e = 0;
-             goto ret;
-           }
        }
       else
-       s = s00;
+       {
+         /* No exponent after an 'E' : that's an error. */
+         ptr->_errno = EINVAL;
+         e = 0;
+         s = s00;
+         goto ret;
+       }
     }
   if (!nd)
     {