Changeset 47857 in webkit for trunk/JavaScriptCore/runtime/JSONObject.cpp

Timestamp:

Aug 27, 2009, 11:17:36 PM (16 years ago)

Author:

[email protected]

Message:

JSON Stringifier does not follow ES5 spec for handling of Number, String and Boolean objects
​https://bugs.webkit.org/show_bug.cgi?id=28797

Reviewed by Maciej Stachowiak

Fixed unwrapBoxedPrimitive to do the right thing, which necessitated a couple of new exception
checks, and corrected the logic in gap to correctly convert Number and String objects.

File:

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

trunk/JavaScriptCore/runtime/JSONObject.cpp

@@ -121 +121 @@
 // ------------------------------ helper functions --------------------------------
 
-static inline JSValue unwrapBoxedPrimitive(JSValue value)
+static inline JSValue unwrapBoxedPrimitive(ExecState* exec, JSValue value)
 {
     if (!value.isObject())
         return value;
-    if (!asObject(value)->inherits(&NumberObject::info) && !asObject(value)->inherits(&StringObject::info) && !asObject(value)->inherits(&BooleanObject::info))
-        return value;
-    return static_cast<JSWrapperObject*>(asObject(value))->internalValue();
-}
-
-static inline UString gap(JSValue space)
-{
-    space = unwrapBoxedPrimitive(space);
+    JSObject* object = asObject(value);
+    if (object->inherits(&NumberObject::info))
+        return jsNumber(exec, object->toNumber(exec));
+    if (object->inherits(&StringObject::info))
+        return jsString(exec, object->toString(exec));
+    if (object->inherits(&BooleanObject::info))
+        return object->toPrimitive(exec);
+    return value;
+}
+
+static inline UString gap(ExecState* exec, JSValue space)
+{
+    const int maxGapLength = 10;
+    space = unwrapBoxedPrimitive(exec, space);
 
     // If the space value is a number, create a gap string with that number of spaces.
     double spaceCount;
     if (space.getNumber(spaceCount)) {
-        const int maxSpaceCount = 100;
         int count;
-        if (spaceCount > maxSpaceCount)
-            count = maxSpaceCount;
+        if (spaceCount > maxGapLength)
+            count = maxGapLength;
         else if (!(spaceCount > 0))
             count = 0;
         else
             count = static_cast<int>(spaceCount);
-        UChar spaces[maxSpaceCount];
+        UChar spaces[maxGapLength];
         for (int i = 0; i < count; ++i)
             spaces[i] = ' ';
@@ -152 +157 @@
 
     // If the space value is a string, use it as the gap string, otherwise use no gap string.
-    return space.getString();
+    UString spaces = space.getString();
+    if (spaces.size() > maxGapLength) {
+        spaces = spaces.substr(0, maxGapLength);
+    }
+    return spaces;
 }
 
@@ -188 +197 @@
     , m_arrayReplacerPropertyNames(exec)
     , m_replacerCallType(CallTypeNone)
-    , m_gap(gap(space))
+    , m_gap(gap(exec, space))
 {
     exec->globalData().firstStringifierToMark = this;
@@ -204 +213 @@
                 break;
 
-            if (name.isObject()) {
-                if (!asObject(name)->inherits(&NumberObject::info) && !asObject(name)->inherits(&StringObject::info))
-                    continue;
-                name = static_cast<JSWrapperObject*>(asObject(name))->internalValue();
-            }
-
             UString propertyName;
             if (name.getString(propertyName)) {
@@ -222 +225 @@
             }
 
-            if (exec->hadException())
-                return;
+            if (name.isObject()) {
+                if (!asObject(name)->inherits(&NumberObject::info) && !asObject(name)->inherits(&StringObject::info))
+                    continue;
+                propertyName = name.toString(exec);
+                if (exec->hadException())
+                    break;
+                m_arrayReplacerPropertyNames.add(Identifier(exec, propertyName));
+            }
         }
         return;
@@ -370 +379 @@
     }
 
-    value = unwrapBoxedPrimitive(value);
+    value = unwrapBoxedPrimitive(m_exec, value);
+
+    if (m_exec->hadException())
+        return StringifyFailed;
 
     if (value.isBoolean()) {