ASSERTION FAILED: context().isInitialized() ./Modules/webaudio/OfflineAudioDestinationNode.cpp(142)

cdumez · cdumez · commit ba9564883d7a · 2021-04-21T18:47:52.000Z
https://bugs.webkit.org/show_bug.cgi?id=224876 <rdar://76896256> Reviewed by Eric Carlson. Source/WebCore: In OfflineAudioDestinationNode::uninitialize(), we were synchronizing with the render thread to make sure that OfflineAudioDestinationNode::offlineRender() was done running before proceeding with uninitialization. However, when an audio worklet is used, m_renderThread is null and no synchronization with the AudioWorklet thread would happen. This patch adds the missing synchronization with the AudioWorklet thread when present. Test: webaudio/OfflineAudioContext/offlineaudiocontext-uninitialized-crash.html * Modules/webaudio/OfflineAudioDestinationNode.cpp: (WebCore::OfflineAudioDestinationNode::uninitialize): LayoutTests: Add layout test coverage. * webaudio/OfflineAudioContext/offlineaudiocontext-uninitialized-crash-expected.txt: Added. * webaudio/OfflineAudioContext/offlineaudiocontext-uninitialized-crash.html: Added. Canonical link: https://commits.webkit.org/236854@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276379 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2021-04-21  Chris Dumez  <cdumez@apple.com>
+
+        ASSERTION FAILED: context().isInitialized() ./Modules/webaudio/OfflineAudioDestinationNode.cpp(142)
+        https://bugs.webkit.org/show_bug.cgi?id=224876
+        <rdar://76896256>
+
+        Reviewed by Eric Carlson.
+
+        Add layout test coverage.
+
+        * webaudio/OfflineAudioContext/offlineaudiocontext-uninitialized-crash-expected.txt: Added.
+        * webaudio/OfflineAudioContext/offlineaudiocontext-uninitialized-crash.html: Added.
+
 2021-04-21  Simon Fraser  <simon.fraser@apple.com>
 
         will-change: transform should affect nested position:fixed
diff --git a/LayoutTests/webaudio/OfflineAudioContext/offlineaudiocontext-uninitialized-crash-expected.txt b/LayoutTests/webaudio/OfflineAudioContext/offlineaudiocontext-uninitialized-crash-expected.txt
@@ -0,0 +1 @@
+This test passes if it does not crash.
diff --git a/LayoutTests/webaudio/OfflineAudioContext/offlineaudiocontext-uninitialized-crash.html b/LayoutTests/webaudio/OfflineAudioContext/offlineaudiocontext-uninitialized-crash.html
@@ -0,0 +1,27 @@
+<p>This test passes if it does not crash.</p>
+<script>
+  if (window.testRunner)
+    testRunner.dumpAsText();
+
+  onload = async () => {
+    let contexts = [];
+    onunload = () => {
+      while (contexts.length) {
+        let ctx = contexts.pop();
+        ctx.startRendering();
+      }
+    };
+
+    for (let i = 0; i < 15; i++) {
+      let offlineAudioContext = new OfflineAudioContext({
+        length: 1,
+        sampleRate: 3000
+      });
+      contexts.push(offlineAudioContext);
+      try {
+        await offlineAudioContext.audioWorklet.addModule('');
+      } catch {
+      }
+    }
+  };
+</script>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2021-04-21  Chris Dumez  <cdumez@apple.com>
+
+        ASSERTION FAILED: context().isInitialized() ./Modules/webaudio/OfflineAudioDestinationNode.cpp(142)
+        https://bugs.webkit.org/show_bug.cgi?id=224876
+        <rdar://76896256>
+
+        Reviewed by Eric Carlson.
+
+        In OfflineAudioDestinationNode::uninitialize(), we were synchronizing with the
+        render thread to make sure that OfflineAudioDestinationNode::offlineRender() was
+        done running before proceeding with uninitialization. However, when an audio
+        worklet is used, m_renderThread is null and no synchronization with the AudioWorklet
+        thread would happen. This patch adds the missing synchronization with the AudioWorklet
+        thread when present.
+
+        Test: webaudio/OfflineAudioContext/offlineaudiocontext-uninitialized-crash.html
+
+        * Modules/webaudio/OfflineAudioDestinationNode.cpp:
+        (WebCore::OfflineAudioDestinationNode::uninitialize):
+
 2021-04-21  Simon Fraser  <simon.fraser@apple.com>
 
         will-change: transform should affect nested position:fixed
diff --git a/Source/WebCore/Modules/webaudio/OfflineAudioDestinationNode.cpp b/Source/WebCore/Modules/webaudio/OfflineAudioDestinationNode.cpp
@@ -38,6 +38,7 @@
 #include <algorithm>
 #include <wtf/IsoMallocInlines.h>
 #include <wtf/MainThread.h>
+#include <wtf/threads/BinarySemaphore.h>
  
 namespace WebCore {
 
@@ -76,9 +77,18 @@ void OfflineAudioDestinationNode::uninitialize()
     if (!isInitialized())
         return;
 
-    if (m_renderThread) {
-        m_renderThread->waitForCompletion();
-        m_renderThread = nullptr;
+    if (m_startedRendering) {
+        if (m_renderThread) {
+            m_renderThread->waitForCompletion();
+            m_renderThread = nullptr;
+        }
+        if (auto* workletProxy = context().audioWorklet().proxy()) {
+            BinarySemaphore semaphore;
+            workletProxy->postTaskForModeToWorkletGlobalScope([&semaphore](ScriptExecutionContext&) mutable {
+                semaphore.signal();
+            }, WorkerRunLoop::defaultMode());
+            semaphore.wait();
+        }
     }
 
     AudioNode::uninitialize();
