Changeset 259636 in webkit

Timestamp:

Apr 7, 2020, 8:48:08 AM (6 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] $.evalScript should check exception when accessing "global"
​https://bugs.webkit.org/show_bug.cgi?id=210114
<rdar://problem/61388482>

Reviewed by Keith Miller.

JSTests:

• stress/eval-script-global-access-exception-check.js: Added.

(shouldThrow):

Source/JavaScriptCore:

$.evalScript should check exception after "global" property access since it can throw an error if it is an accessor.

• jsc.cpp:

(functionDollarEvalScript):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/eval-script-global-access-exception-check.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/jsc.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-04-07  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] $.evalScript should check exception when accessing "global"
+        https://bugs.webkit.org/show_bug.cgi?id=210114
+        <rdar://problem/61388482>
+
+        Reviewed by Keith Miller.
+
+        * stress/eval-script-global-access-exception-check.js: Added.
+        (shouldThrow):
+
 2020-04-06  Rick Waldron  <waldron.rick@gmail.com> and Alexey Shvayka  <shvaikalesh@gmail.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-04-07  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] $.evalScript should check exception when accessing "global"
+        https://bugs.webkit.org/show_bug.cgi?id=210114
+        <rdar://problem/61388482>
+
+        Reviewed by Keith Miller.
+
+        $.evalScript should check exception after "global" property access since it can throw an error if it is an accessor.
+
+        * jsc.cpp:
+        (functionDollarEvalScript):
+
 2020-04-06  Devin Rousso  <drousso@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -1860 +1860 @@
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
     
-    GlobalObject* realm = jsDynamicCast<GlobalObject*>(vm,
-        callFrame->thisValue().get(globalObject, Identifier::fromString(vm, "global")));
+    JSValue global = callFrame->thisValue().get(globalObject, Identifier::fromString(vm, "global"));
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    GlobalObject* realm = jsDynamicCast<GlobalObject*>(vm, global);
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
     if (!realm)