Changeset 24394 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

Jul 17, 2007, 7:25:38 PM (18 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Darin, Maciej, and Adam.

Fixes <​http://bugs.webkit.org/show_bug.cgi?id=9697>,

the failure of ecma/GlobalObject/15.1.2.2-2.js,
the failure of ecma/LexicalConventions/7.7.3-1.js,
and most of the failures of tests in ecma/TypeConversion/9.3.1-3.js.

Bug 9697: parseInt results may be inaccurate for numbers greater than 2⁵³

This patch also fixes similar issues in the lexer and UString::toDouble().

• kjs/function.cpp: (KJS::parseIntOverflow): (KJS::parseInt):
• kjs/function.h:
• kjs/lexer.cpp: (KJS::Lexer::lex):
• kjs/ustring.cpp: (KJS::UString::toDouble):
• tests/mozilla/expected.html:

LayoutTests:

Reviewed by Darin.

Added tests for:
​http://bugs.webkit.org/show_bug.cgi?id=9697

Bug 9697: parseInt results may be inaccurate for numbers greater than 2⁵³

• fast/js/numeric-conversion-expected.txt: Added.
• fast/js/numeric-conversion.html: Added.
• fast/js/resources/numeric-conversion.js: Added.

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -4 +4 @@
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
  *  Copyright (C) 2004 Apple Computer, Inc.
+ *  Copyright (C) 2007 Cameron Zwarich ([email protected])
  *
  *  This library is free software; you can redistribute it and/or
@@ -27 +28 @@
 #include "JSLock.h"
 #include "dtoa.h"
+#include "function.h"
 #include "identifier.h"
 #include "operations.h"
@@ -889 +891 @@
   // hex number ?
   if (*c == '0' && (*(c+1) == 'x' || *(c+1) == 'X')) {
+    const char* firstDigitPosition = c + 2;
     c++;
     d = 0.0;
@@ -899 +902 @@
         break;
     }
+
+    if (d >= mantissaOverflowLowerBound)
+        d = parseIntOverflow(firstDigitPosition, c - firstDigitPosition, 16);
   } else {
     // regular number ?
     char *end;
     d = kjs_strtod(c, &end);
-    if ((d != 0.0 || end != c) && d != HUGE_VAL && d != -HUGE_VAL) {
+    if ((d != 0.0 || end != c) && d != Inf && d != -Inf) {
       c = end;
     } else {
-      // infinity ?
-      d = 1.0;
+      double sign = 1.0;
+
       if (*c == '+')
         c++;
       else if (*c == '-') {
-        d = -1.0;
+        sign = -1.0;
         c++;
       }
-      if (strncmp(c, "Infinity", 8) != 0)
+
+      // We used strtod() to do the conversion. However, strtod() handles
+      // infinite values slightly differently than JavaScript in that it
+      // converts the string "inf" with any capitalization to infinity,
+      // whereas the ECMA spec requires that it be converted to NaN.
+
+      if (strncmp(c, "Infinity", 8) == 0) {
+        d = sign * Inf;
+        c += 8;
+      } else if ((d == Inf || d == -Inf) && *c != 'I' && *c != 'i')
+        c = end;
+      else
         return NaN;
-      d = d * Inf;
-      c += 8;
     }
   }