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

Timestamp:

Jul 12, 2003, 9:01:36 AM (22 years ago)

Author:

darin

Message:

Reviewed by Dave.

• fixed 3272777 -- array object indices treated as integers by Safari, but as strings in other web browsers

JavaScriptCore did not implement the proper rule for what an array index is.

• kjs/array_object.cpp: (getArrayIndex): Added. Implements the rule from the specification, which also provides a handy "not an array index" value of 2^{32-1. (ArrayInstanceImp::get): Use getArrayIndex. (ArrayInstanceImp::put): Ditto. (ArrayInstanceImp::hasProperty): Ditto. (ArrayInstanceImp::setLength): Ditto.}

• kjs/identifier.h: Removed now-unused toULong, and added toStrictUInt32, in both cases forwarding functions that forward to UString.

• kjs/ustring.h: Added toStringUInt32.
• kjs/ustring.cpp: (UString::toStrictUInt32): Added. Converts a string to a 32-bit unsigned integer, and rejects any string that does not exactly match the way the integer would be formatted on output. This is the rule documented in the ECMA language standard.

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -659 +659 @@
 }
 
+uint32_t UString::toStrictUInt32(bool *ok) const
+{
+  if (ok)
+    *ok = false;
+
+  // Empty string is not OK.
+  int len = rep->len;
+  if (len == 0)
+    return 0;
+  const UChar *p = rep->dat;
+  unsigned short c = p->unicode();
+
+  // If the first digit is 0, only 0 itself is OK.
+  if (c == '0') {
+    if (len == 1 && ok)
+      *ok = true;
+    return 0;
+  }
+  
+  // Convert to UInt32, checking for overflow.
+  uint32_t i = 0;
+  while (1) {
+    // Process character, turning it into a digit.
+    if (c < '0' || c > '9')
+      return 0;
+    const unsigned d = c - '0';
+    
+    // Check for overflow.
+    const unsigned maxProduct = 0xFFFFFFFFU - d;
+    if (i > maxProduct / 10)
+      return 0;
+    
+    // Add in another digit.
+    i *= 10;
+    i += d;
+    
+    // Handle end of string.
+    if (--len == 0) {
+      if (ok)
+        *ok = true;
+      return i;
+    }
+    
+    // Get next character.
+    c = (++p)->unicode();
+  }
+}
+
 int UString::find(const UString &f, int pos) const
 {