Changeset 110657 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

Timestamp:

Mar 13, 2012, 7:12:25 PM (13 years ago)

Author:

[email protected]

Message:

Type conversion of exponential part failed
​https://bugs.webkit.org/show_bug.cgi?id=80673

Reviewed by Geoffrey Garen.

• parser/Lexer.cpp:

(JSC::::lex):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::parseInt):
(JSC):
(JSC::jsStrDecimalLiteral): Added another template argument that exposes whether or not
we accept trailing junk to clients of jsStrDecimalLiteral. Also added additional template
parameter for strtod to allow trailing spaces.
(JSC::toDouble):
(JSC::parseFloat): Accept trailing junk, as per the ECMA 262 spec (15.1.2.3).

• runtime/LiteralParser.cpp:

(JSC::::Lexer::lexNumber):

• tests/mozilla/expected.html: Update the expected page for run-javascriptcore-tests so that

we will run ecma/TypeConversion/9.3.1-3.js as a regression test now.

• wtf/dtoa.cpp:

(WTF):
(WTF::strtod): We also needed to sometimes accept trailing spaces to pass a few other tests that were
broken by changing the default allowance of trailing junk in jsStrDecimalLiteral.

• wtf/dtoa.h:
• wtf/dtoa/double-conversion.cc: When the AdvanceToNonspace function was lifted out of the

Chromium codebase, the person porting it only thought to check for spaces when skipping whitespace.
A few of our JSC tests check for other types of trailing whitespace, so I've added checks for those
here to cover those cases (horizontal tab, vertical tab, carriage return, form feed, and line feed).

• wtf/text/WTFString.cpp:

(WTF::toDoubleType): Disallow trailing spaces, as this breaks form input verification stuff.

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -298 +298 @@
     if (number >= mantissaOverflowLowerBound) {
         if (radix == 10)
-            number = WTF::strtod<WTF::AllowTrailingJunk>(s.substringSharingImpl(firstDigitPosition, p - firstDigitPosition).utf8().data(), 0);
+            number = WTF::strtod<WTF::AllowTrailingJunk, WTF::DisallowTrailingSpaces>(s.substringSharingImpl(firstDigitPosition, p - firstDigitPosition).utf8().data(), 0);
         else if (radix == 2 || radix == 4 || radix == 8 || radix == 16 || radix == 32)
             number = parseIntOverflow(s.substringSharingImpl(firstDigitPosition, p - firstDigitPosition).utf8().data(), p - firstDigitPosition, radix);
@@ -357 +357 @@
 
 // See ecma-262 9.3.1
-template <typename CharType>
+template <WTF::AllowTrailingJunkTag allowTrailingJunk, typename CharType>
 static double jsStrDecimalLiteral(const CharType*& data, const CharType* end)
 {
@@ -370 +370 @@
     byteBuffer.append(0);
     char* endOfNumber;
-    double number = WTF::strtod<WTF::AllowTrailingJunk>(byteBuffer.data(), &endOfNumber);
+    double number = WTF::strtod<allowTrailingJunk, WTF::AllowTrailingSpaces>(byteBuffer.data(), &endOfNumber);
 
     // Check if strtod found a number; if so return it.
@@ -426 +426 @@
         number = jsHexIntegerLiteral(characters, endCharacters);
     else
-        number = jsStrDecimalLiteral(characters, endCharacters);
+        number = jsStrDecimalLiteral<WTF::DisallowTrailingJunk>(characters, endCharacters);
     
     // Allow trailing white space.
@@ -483 +483 @@
             return std::numeric_limits<double>::quiet_NaN();
 
-        return jsStrDecimalLiteral(data, end);
+        return jsStrDecimalLiteral<WTF::AllowTrailingJunk>(data, end);
     }
 
@@ -499 +499 @@
         return std::numeric_limits<double>::quiet_NaN();
 
-    return jsStrDecimalLiteral(data, end);
+    return jsStrDecimalLiteral<WTF::AllowTrailingJunk>(data, end);
 }