Changeset 242868 in webkit

Timestamp:

Mar 13, 2019, 2:25:06 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r242667 - Stack overflow crash in JSC::JSObject::hasInstance.
​https://bugs.webkit.org/show_bug.cgi?id=195458
<rdar://problem/48710195>

Reviewed by Yusuke Suzuki.

JSTests:

• stress/stack-overflow-in-custom-hasInstance.js: Added.

Source/JavaScriptCore:

• runtime/JSObject.cpp:

(JSC::JSObject::hasInstance):

Location:

releases/WebKitGTK/webkit-2.24

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/stack-overflow-in-custom-hasInstance.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSObject.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.24/JSTests/ChangeLog

@@ +1 @@
+2019-03-08  Mark Lam  <mark.lam@apple.com>
+
+        Stack overflow crash in JSC::JSObject::hasInstance.
+        https://bugs.webkit.org/show_bug.cgi?id=195458
+        <rdar://problem/48710195>
+
+        Reviewed by Yusuke Suzuki.
+
+        * stress/stack-overflow-in-custom-hasInstance.js: Added.
+
 2019-03-06  Saam Barati  <sbarati@apple.com>
 

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

@@ +1 @@
+2019-03-08  Mark Lam  <mark.lam@apple.com>
+
+        Stack overflow crash in JSC::JSObject::hasInstance.
+        https://bugs.webkit.org/show_bug.cgi?id=195458
+        <rdar://problem/48710195>
+
+        Reviewed by Yusuke Suzuki.
+
+        * runtime/JSObject.cpp:
+        (JSC::JSObject::hasInstance):
+
 2019-03-06  Saam Barati  <sbarati@apple.com>
 

releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -47 +47 @@
 #include "SlotVisitorInlines.h"
 #include "TypeError.h"
+#include "VMInlines.h"
 #include <math.h>
 #include <wtf/Assertions.h>
@@ -2207 +2208 @@
         RELEASE_AND_RETURN(scope, defaultHasInstance(exec, value, prototype));
     }
-    if (info.implementsHasInstance())
+    if (info.implementsHasInstance()) {
+        if (UNLIKELY(!vm.isSafeToRecurseSoft())) {
+            throwStackOverflowError(exec, scope);
+            return false;
+        }
         RELEASE_AND_RETURN(scope, methodTable(vm)->customHasInstance(this, exec, value));
+    }
 
     throwException(exec, scope, createInvalidInstanceofParameterErrorNotFunction(exec, this));