Changeset 236505 in webkit

Timestamp:

Sep 26, 2018, 9:12:42 AM (8 years ago)

Author:

yusukesuzuki@slowstart.org

Message:

Unreviewed, add scope verification handling
​https://bugs.webkit.org/show_bug.cgi?id=189780

• runtime/ArrayPrototype.cpp:

(JSC::arrayProtoFuncIndexOf):
(JSC::arrayProtoFuncLastIndexOf):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/ArrayPrototype.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-09-26  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
+
+        Unreviewed, add scope verification handling
+        https://bugs.webkit.org/show_bug.cgi?id=189780
+
+        * runtime/ArrayPrototype.cpp:
+        (JSC::arrayProtoFuncIndexOf):
+        (JSC::arrayProtoFuncLastIndexOf):
+
 2018-09-26  Koby Boyango  <koby.b@mce.systems>
 

trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp

@@ -1270 +1270 @@
 
     if (isJSArray(thisObject)) {
-        if (JSValue result = fastIndexOf<IndexOfDirection::Forward>(exec, vm, asArray(thisObject), length, searchElement, index))
+        JSValue result = fastIndexOf<IndexOfDirection::Forward>(exec, vm, asArray(thisObject), length, searchElement, index);
+        RETURN_IF_EXCEPTION(scope, { });
+        if (result)
             return JSValue::encode(result);
     }
@@ -1319 +1321 @@
 
     if (isJSArray(thisObject)) {
-        if (JSValue result = fastIndexOf<IndexOfDirection::Backward>(exec, vm, asArray(thisObject), length, searchElement, index))
+        JSValue result = fastIndexOf<IndexOfDirection::Backward>(exec, vm, asArray(thisObject), length, searchElement, index);
+        RETURN_IF_EXCEPTION(scope, { });
+        if (result)
             return JSValue::encode(result);
     }