Changeset 236122 in webkit

Timestamp:

Sep 18, 2018, 6:32:12 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r235540 - Add missing exception check in arrayProtoFuncLastIndexOf().
​https://bugs.webkit.org/show_bug.cgi?id=189184
<rdar://problem/39785959>

Reviewed by Yusuke Suzuki.

JSTests:

• stress/regress-189184.js: Added.

Source/JavaScriptCore:

• runtime/ArrayPrototype.cpp:

(JSC::arrayProtoFuncLastIndexOf):

Location:

releases/WebKitGTK/webkit-2.22

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/regress-189184.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/ArrayPrototype.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.22/JSTests/ChangeLog

@@ +1 @@
+2018-08-31  Mark Lam  <mark.lam@apple.com>
+
+        Add missing exception check in arrayProtoFuncLastIndexOf().
+        https://bugs.webkit.org/show_bug.cgi?id=189184
+        <rdar://problem/39785959>
+
+        Reviewed by Yusuke Suzuki.
+
+        * stress/regress-189184.js: Added.
+
 2018-08-31  Saam barati  <sbarati@apple.com>
 

releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-08-31  Mark Lam  <mark.lam@apple.com>
+
+        Add missing exception check in arrayProtoFuncLastIndexOf().
+        https://bugs.webkit.org/show_bug.cgi?id=189184
+        <rdar://problem/39785959>
+
+        Reviewed by Yusuke Suzuki.
+
+        * runtime/ArrayPrototype.cpp:
+        (JSC::arrayProtoFuncLastIndexOf):
+
 2018-08-31  Saam barati  <sbarati@apple.com>
 

releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/runtime/ArrayPrototype.cpp

@@ -1216 +1216 @@
         if (!e)
             continue;
-        if (JSValue::strictEqual(exec, searchElement, e))
+        bool isEqual = JSValue::strictEqual(exec, searchElement, e);
+        RETURN_IF_EXCEPTION(scope, encodedJSValue());
+        if (isEqual)
             return JSValue::encode(jsNumber(index));
-        RETURN_IF_EXCEPTION(scope, encodedJSValue());
     } while (index--);