From 3c45ffa5146a7132ea4867981f0d2a737d656e54 Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Fri, 23 Mar 2001 16:59:57 -0800 Subject: [PATCH] natDouble.cc (parseDouble): Cannot use errno to check for errors... * java/lang/natDouble.cc (parseDouble): Cannot use errno to check for errors, since we don't want to throw exception on overflow/underflow. Instead, trim whitespace, and then check that _strtod_r uses up all the rest of the string. From-SVN: r40800 --- libjava/java/lang/natDouble.cc | 40 +++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/libjava/java/lang/natDouble.cc b/libjava/java/lang/natDouble.cc index 9ed7e53910d..af2d70ad6f3 100644 --- a/libjava/java/lang/natDouble.cc +++ b/libjava/java/lang/natDouble.cc @@ -15,6 +15,7 @@ details. */ #include #include #include +#include #include #include @@ -160,19 +161,28 @@ jdouble java::lang::Double::parseDouble(jstring str) { int length = str->length(); - // Note that UTF can expand 3x. - - char *data = (char *) __builtin_alloca (3 * length + 1); - - data[_Jv_GetStringUTFRegion (str, 0, length, data)] = 0; - - struct _Jv_reent reent; - memset (&reent, 0, sizeof reent); - - double val = _strtod_r (&reent, data, NULL); - - if (reent._errno) - _Jv_Throw (new NumberFormatException); - - return val; + while (length > 0 + && Character::isWhitespace(str->charAt(length - 1))) + length--; + jsize start = 0; + while (length > 0 + && Character::isWhitespace(str->charAt(start))) + start++, length--; + + if (length > 0) + { + // Note that UTF can expand 3x. + char *data = (char *) __builtin_alloca (3 * length + 1); + jsize blength = _Jv_GetStringUTFRegion (str, start, length, data); + data[blength] = 0; + + struct _Jv_reent reent; + memset (&reent, 0, sizeof reent); + + char *endptr; + double val = _strtod_r (&reent, data, &endptr); + if (endptr == data + blength) + return val; + } + _Jv_Throw (new NumberFormatException); } -- 2.30.2