Issue #1587 Part 12 (followup 2): Allow clearing of signal by setting to null.

3 files changed, 7 insertions, 2 deletions

diff --git a/dom/fetch/FetchDriver.cpp b/dom/fetch/FetchDriver.cpp
index 067e32db4..fd1e99a2b 100644
--- a/dom/fetch/FetchDriver.cpp
+++ b/dom/fetch/FetchDriver.cpp
@@ -499,6 +499,11 @@ FetchDriver::OnStartRequest(nsIRequest* aRequest,
     return rv;
   }
 
+  if (!mChannel) {
+    MOZ_ASSERT(!mObserver);
+    return NS_BINDING_ABORTED;
+  }
+
   // We should only get to the following code once.
   MOZ_ASSERT(!mPipeOutputStream);
   MOZ_ASSERT(mObserver);
diff --git a/dom/fetch/Request.cpp b/dom/fetch/Request.cpp
index ba268d331..76f3ce5c5 100644
--- a/dom/fetch/Request.cpp
+++ b/dom/fetch/Request.cpp
@@ -425,7 +425,7 @@ Request::Constructor(const GlobalObject& aGlobal,
   }
 
   if (aInit.mSignal.WasPassed()) {
-    signal = &aInit.mSignal.Value();
+    signal = aInit.mSignal.Value();
   }
 
   if (NS_IsMainThread()) {
diff --git a/dom/webidl/Request.webidl b/dom/webidl/Request.webidl
index 57bea5db6..9140543e7 100644
--- a/dom/webidl/Request.webidl
+++ b/dom/webidl/Request.webidl
@@ -53,7 +53,7 @@ dictionary RequestInit {
   DOMString integrity;
 
   [Func="AbortController::IsEnabled"]
-  AbortSignal signal;
+  AbortSignal? signal;
 
   [Func="FetchObserver::IsEnabled"]
   ObserverCallback observe;