Changeset 284861 in webkit

Timestamp:

Oct 26, 2021, 2:46:30 AM (5 years ago)

Author:

youenn@apple.com

Message:

Beef up worker termination handling in ReadableStream routines
​https://bugs.webkit.org/show_bug.cgi?id=231500
<rdar://83687915>

Reviewed by Darin Adler.

Add some termination/exception checks after getting values from global objects.
Covered by existing tests.

• bindings/js/ReadableStream.cpp:

(WebCore::ReadableStream::create):
(WebCore::ReadableStream::lock):

• bindings/js/ReadableStreamDefaultController.cpp:

(WebCore::invokeReadableStreamDefaultControllerFunction):
(WebCore::ReadableStreamDefaultController::enqueue):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ReadableStream.cpp (modified) (2 diffs)
• bindings/js/ReadableStreamDefaultController.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-26  Youenn Fablet  <youenn@apple.com>
+
+        Beef up worker termination handling in ReadableStream routines
+        https://bugs.webkit.org/show_bug.cgi?id=231500
+        <rdar://83687915>
+
+        Reviewed by Darin Adler.
+
+        Add some termination/exception checks after getting values from global objects.
+        Covered by existing tests.
+
+        * bindings/js/ReadableStream.cpp:
+        (WebCore::ReadableStream::create):
+        (WebCore::ReadableStream::lock):
+        * bindings/js/ReadableStreamDefaultController.cpp:
+        (WebCore::invokeReadableStreamDefaultControllerFunction):
+        (WebCore::ReadableStreamDefaultController::enqueue):
+
 2021-10-26  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/bindings/js/ReadableStream.cpp

@@ -47 +47 @@
 
     auto* constructor = JSC::asObject(globalObject.get(&lexicalGlobalObject, clientData.builtinNames().ReadableStreamPrivateName()));
+    RETURN_IF_EXCEPTION(scope, Exception { ExistingExceptionError });
 
     auto constructData = getConstructData(vm, constructor);
@@ -116 +117 @@
     auto& lexicalGlobalObject = *m_globalObject;
     auto& vm = lexicalGlobalObject.vm();
-#if ENABLE(EXCEPTION_SCOPE_VERIFICATION)
     auto scope = DECLARE_CATCH_SCOPE(vm);
-#endif
 
     auto& clientData = *static_cast<JSVMClientData*>(vm.clientData);
 
     auto* constructor = JSC::asObject(m_globalObject->get(&lexicalGlobalObject, clientData.builtinNames().ReadableStreamDefaultReaderPrivateName()));
+    EXCEPTION_ASSERT(!scope.exception() || vm.hasPendingTerminationException());
+    if (scope.exception())
+        return;
 
     auto constructData = getConstructData(vm, constructor);

trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.cpp

@@ -45 +45 @@
     JSC::JSLockHolder lock(vm);
 
+    auto scope = DECLARE_CATCH_SCOPE(vm);
     auto function = lexicalGlobalObject.get(&lexicalGlobalObject, identifier);
+
+    EXCEPTION_ASSERT(!scope.exception() || vm.hasPendingTerminationException());
+    RETURN_IF_EXCEPTION(scope, false);
+
     ASSERT(function.isCallable(lexicalGlobalObject.vm()));
 
-    auto scope = DECLARE_CATCH_SCOPE(vm);
     auto callData = JSC::getCallData(vm, function);
     call(&lexicalGlobalObject, function, callData, JSC::jsUndefined(), arguments);
@@ -121 +125 @@
     auto value = toJS(&lexicalGlobalObject, &lexicalGlobalObject, chunk.get());
 
-    if (UNLIKELY(scope.exception())) {
-        ASSERT(vm.hasPendingTerminationException());
-        return false;
-    }
+    EXCEPTION_ASSERT(!scope.exception() || vm.hasPendingTerminationException());
+    RETURN_IF_EXCEPTION(scope, false);
 
     return enqueue(value);