1 files changed, 13 insertions, 0 deletions
diff --git a/dom/webscheduling/WebTaskSchedulerWorker.cpp b/dom/webscheduling/WebTaskSchedulerWorker.cpp
index 89fbb6169f..479d12cf7b 100644
--- a/dom/webscheduling/WebTaskSchedulerWorker.cpp
+++ b/dom/webscheduling/WebTaskSchedulerWorker.cpp
@@ -36,6 +36,9 @@ bool WebTaskWorkerRunnable::WorkerRun(JSContext* aCx,
 
 nsresult WebTaskSchedulerWorker::SetTimeoutForDelayedTask(WebTask* aTask,
                                                           uint64_t aDelay) {
+  if (!mWorkerPrivate) {
+    return NS_ERROR_UNEXPECTED;
+  }
   JSContext* cx = nsContentUtils::GetCurrentJSContext();
   if (!cx) {
     return NS_ERROR_UNEXPECTED;
@@ -52,8 +55,18 @@ nsresult WebTaskSchedulerWorker::SetTimeoutForDelayedTask(WebTask* aTask,
 }
 
 bool WebTaskSchedulerWorker::DispatchEventLoopRunnable() {
+  if (!mWorkerPrivate) {
+    return false;
+  }
   RefPtr<WebTaskWorkerRunnable> runnable =
       new WebTaskWorkerRunnable(mWorkerPrivate, this);
   return runnable->Dispatch();
 }
+
+void WebTaskSchedulerWorker::Disconnect() {
+  if (mWorkerPrivate) {
+    mWorkerPrivate = nullptr;
+  }
+  WebTaskScheduler::Disconnect();
+}
 }  // namespace mozilla::dom