Changeset 246162 in webkit

Timestamp:

Jun 6, 2019 12:07:55 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

JSON.parse throws incorrect exception when called w/o arguments
​https://bugs.webkit.org/show_bug.cgi?id=198574

Patch by Alexey Shvayka <Alexey Shvayka> on 2019-06-06
Reviewed by Yusuke Suzuki.

Source/JavaScriptCore:

Always coerce first argument to string and attempt to parse it.
(steps 1-2 of ​https://tc39.github.io/ecma262/#sec-json.parse)

• runtime/JSONObject.cpp:

(JSC::JSONProtoFuncParse): Remove argumentCount check.

LayoutTests:

SyntaxError should be thrown if JSON.parse is called w/o arguments.
(steps 1-2 of ​https://tc39.github.io/ecma262/#sec-json.parse)

• js/dom/JSON-parse-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/dom/JSON-parse-expected.txt (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSONObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-06-06  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        JSON.parse throws incorrect exception when called w/o arguments
+        https://bugs.webkit.org/show_bug.cgi?id=198574
+
+        Reviewed by Yusuke Suzuki.
+
+        SyntaxError should be thrown if JSON.parse is called w/o arguments.
+        (steps 1-2 of https://tc39.github.io/ecma262/#sec-json.parse)
+
+        * js/dom/JSON-parse-expected.txt:
+
 2019-06-06  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/js/dom/JSON-parse-expected.txt

@@ -2 +2 @@
         return jsonObject.parse();
     }
-PASS tests[i](nativeJSON) threw exception Error: JSON.parse requires at least one parameter.
+PASS tests[i](nativeJSON) threw exception SyntaxError: JSON Parse error: Unexpected identifier "undefined".
 function (jsonObject){
         return jsonObject.parse('');

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-06-06  Alexey Shvayka  <shvaikalesh@gmail.com>
+
+        JSON.parse throws incorrect exception when called w/o arguments
+        https://bugs.webkit.org/show_bug.cgi?id=198574
+
+        Reviewed by Yusuke Suzuki.
+
+        Always coerce first argument to string and attempt to parse it.
+        (steps 1-2 of https://tc39.github.io/ecma262/#sec-json.parse)
+
+        * runtime/JSONObject.cpp:
+        (JSC::JSONProtoFuncParse): Remove argumentCount check.
+
 2019-06-06  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSONObject.cpp

@@ -802 +802 @@
     VM& vm = exec->vm();
     auto scope = DECLARE_THROW_SCOPE(vm);
-
-    if (!exec->argumentCount())
-        return throwVMError(exec, scope, createError(exec, "JSON.parse requires at least one parameter"_s));
-    auto viewWithString = exec->uncheckedArgument(0).toString(exec)->viewWithUnderlyingString(exec);
+    auto viewWithString = exec->argument(0).toString(exec)->viewWithUnderlyingString(exec);
     RETURN_IF_EXCEPTION(scope, { });
     StringView view = viewWithString.view;