Changeset 264866 in webkit

Timestamp:

Jul 24, 2020, 3:56:01 PM (5 years ago)

Author:

mark.lam@apple.com

Message:

Fix exception check handling below postMessage().
​https://bugs.webkit.org/show_bug.cgi?id=214761
<rdar://problem/65932136>

Reviewed by Yusuke Suzuki and Keith Miller.

Source/WebCore:

Test: js/dom/missing-exception-check-below-postMessage.html

• bindings/js/JSDOMConvertSequences.h:

(WebCore::Detail::SequenceConverter::convertArray):
(WebCore::Detail::SequenceConverter::convert):

LayoutTests:

• js/dom/missing-exception-check-below-postMessage-expected.txt: Added.
• js/dom/missing-exception-check-below-postMessage.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/dom/missing-exception-check-below-postMessage-expected.txt (added)
• LayoutTests/js/dom/missing-exception-check-below-postMessage.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMConvertSequences.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-07-24  Mark Lam  <mark.lam@apple.com>
+
+        Fix exception check handling below postMessage().
+        https://bugs.webkit.org/show_bug.cgi?id=214761
+        <rdar://problem/65932136>
+
+        Reviewed by Yusuke Suzuki and Keith Miller.
+
+        * js/dom/missing-exception-check-below-postMessage-expected.txt: Added.
+        * js/dom/missing-exception-check-below-postMessage.html: Added.
+
 2020-07-24  Kenneth Russell  <kbr@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-24  Mark Lam  <mark.lam@apple.com>
+
+        Fix exception check handling below postMessage().
+        https://bugs.webkit.org/show_bug.cgi?id=214761
+        <rdar://problem/65932136>
+
+        Reviewed by Yusuke Suzuki and Keith Miller.
+
+        Test: js/dom/missing-exception-check-below-postMessage.html
+
+        * bindings/js/JSDOMConvertSequences.h:
+        (WebCore::Detail::SequenceConverter::convertArray):
+        (WebCore::Detail::SequenceConverter::convert):
+
 2020-07-24  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/bindings/js/JSDOMConvertSequences.h

@@ -196 +196 @@
     using ReturnType = typename GenericConverter::ReturnType;
 
-    static ReturnType convertArray(JSC::JSGlobalObject& lexicalGlobalObject, JSC::ThrowScope& scope, JSC::JSArray* array)
-    {
+    static ReturnType convertArray(JSC::JSGlobalObject& lexicalGlobalObject, JSC::JSArray* array)
+    {
+        auto& vm = lexicalGlobalObject.vm();
+        auto scope = DECLARE_THROW_SCOPE(vm);
         unsigned length = array->length();
 
@@ -250 +252 @@
         JSC::JSObject* object = JSC::asObject(value);
         if (Converter<IDLType>::conversionHasSideEffects)
-            return GenericConverter::convert(lexicalGlobalObject, object);
+            RELEASE_AND_RETURN(scope, (GenericConverter::convert(lexicalGlobalObject, object)));
 
         if (!JSC::isJSArray(object))
-            return GenericConverter::convert(lexicalGlobalObject, object);
+            RELEASE_AND_RETURN(scope, (GenericConverter::convert(lexicalGlobalObject, object)));
 
         JSC::JSArray* array = JSC::asArray(object);
         if (!array->isIteratorProtocolFastAndNonObservable())
-            return GenericConverter::convert(lexicalGlobalObject, object);
+            RELEASE_AND_RETURN(scope, (GenericConverter::convert(lexicalGlobalObject, object)));
         
-        return convertArray(lexicalGlobalObject, scope, array);
-    }
-
-    static ReturnType convert(JSC::JSGlobalObject& lexicalGlobalObject, JSC::JSObject* object, JSC::JSValue method)
-    {
-        auto& vm = JSC::getVM(&lexicalGlobalObject);
-        auto scope = DECLARE_THROW_SCOPE(vm);
-
+        RELEASE_AND_RETURN(scope, (convertArray(lexicalGlobalObject, array)));
+    }
+
+    static ReturnType convert(JSC::JSGlobalObject& lexicalGlobalObject, JSC::JSObject* object, JSC::JSValue method)
+    {
         if (Converter<IDLType>::conversionHasSideEffects)
             return GenericConverter::convert(lexicalGlobalObject, object, method);
@@ -277 +276 @@
             return GenericConverter::convert(lexicalGlobalObject, object, method);
 
-        return convertArray(lexicalGlobalObject, scope, array);
+        return convertArray(lexicalGlobalObject, array);
     }
 };