Changeset 47847 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 27, 2009, 5:27:10 PM (16 years ago)

Author:

[email protected]

Message:

JSON.stringify replacer array does not accept values that are not string primitives.
​https://bugs.webkit.org/show_bug.cgi?id=28788

Reviewed by Adam Roben

Update the JSON stringifier to initialise its replacer array according to the most
recent version of the spec.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (2 diffs)
• runtime/Identifier.h (modified) (1 diff)
• runtime/JSONObject.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-08-27  Oliver Hunt  <[email protected]>
+
+        Reviewed by Adam Roben.
+
+        JSON.stringify replacer array does not accept values that are not string primitives.
+        https://bugs.webkit.org/show_bug.cgi?id=28788
+
+        Update the JSON stringifier to initialise its replacer array according to the most
+        recent version of the spec.
+
+        * runtime/Identifier.h:
+        (JSC::Identifier::from):
+        * runtime/JSONObject.cpp:
+        (JSC::Stringifier::Stringifier):
+
 2009-08-27  Alexey Proskuryakov  <[email protected]>
 
@@ -53 +68 @@
         * assembler/X86Assembler.h:
         (JSC::CAN_SIGN_EXTEND_8_32):
+
+2009-08-27  Oliver Hunt  <[email protected]>
+
+        Reviewed by Adam Roben.
+
+        JSON.stringify replacer array does not accept values that are not string primitives.
+        https://bugs.webkit.org/show_bug.cgi?id=28788
+
+        Update the JSON stringifier to initialise its replacer array according to the most
+        recent version of the spec.
+
+        * runtime/Identifier.h:
+        (JSC::Identifier::from):
+        * runtime/JSONObject.cpp:
+        (JSC::Stringifier::Stringifier):
 
 2009-08-27  Oliver Hunt  <[email protected]>

trunk/JavaScriptCore/runtime/Identifier.h

@@ -55 +55 @@
         
         static Identifier from(ExecState* exec, unsigned y) { return Identifier(exec, UString::from(y)); }
+        static Identifier from(ExecState* exec, int y) { return Identifier(exec, UString::from(y)); }
+        static Identifier from(ExecState* exec, double y) { return Identifier(exec, UString::from(y)); }
         
         bool isNull() const { return _ustring.isNull(); }

trunk/JavaScriptCore/runtime/JSONObject.cpp

@@ -203 +203 @@
             if (exec->hadException())
                 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))
+            if (name.getString(propertyName)) {
+                m_arrayReplacerPropertyNames.add(Identifier(exec, propertyName));
                 continue;
+            }
+
+            double value = 0;
+            if (name.getNumber(value)) {
+                m_arrayReplacerPropertyNames.add(Identifier::from(exec, value));
+                continue;
+            }
+
             if (exec->hadException())
                 return;
-            m_arrayReplacerPropertyNames.add(Identifier(exec, propertyName));
         }
         return;