Bug 1577311 - Close the stream if there is a failure during the creat…

…ion; r=baku

Differential Revision: https://phabricator.services.mozilla.com/D47118

dom/base/BodyStream.cpp

@@ -48,7 +48,7 @@ void BodyStreamHolder::StoreBodyStream(BodyStream* aBodyStream) {
 }
 
 void BodyStreamHolder::ForgetBodyStream() {
-  MOZ_ASSERT(mBodyStream);
+  MOZ_ASSERT_IF(mStreamCreated, mBodyStream);
   mBodyStream = nullptr;
 }
 
@@ -92,6 +92,8 @@ void BodyStream::Create(JSContext* aCx, BodyStreamHolder* aStreamHolder,
   RefPtr<BodyStream> stream =
       new BodyStream(aGlobal, aStreamHolder, aInputStream);
 
+  auto cleanup = MakeScopeExit([stream] { stream->Close(); });
+
   if (NS_IsMainThread()) {
     nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
     if (NS_WARN_IF(!os)) {
@@ -135,8 +137,14 @@ void BodyStream::Create(JSContext* aCx, BodyStreamHolder* aStreamHolder,
   // js object is finalized.
   NS_ADDREF(stream.get());
 
+  cleanup.release();
+
   aStreamHolder->StoreBodyStream(stream);
   aStreamHolder->SetReadableStreamBody(body);
+
+#ifdef DEBUG
+  aStreamHolder->mStreamCreated = true;
+#endif
 }
 
 void BodyStream::requestData(JSContext* aCx, JS::HandleObject aStream,

dom/base/BodyStream.h

@@ -51,6 +51,10 @@ class BodyStreamHolder : public nsISupports {
   // Raw pointer because BodyStream keeps BodyStreamHolder alive and it
   // nullifies this stream before being released.
   BodyStream* mBodyStream;
+
+#ifdef DEBUG
+  bool mStreamCreated = false;
+#endif
 };
 
 class BodyStream final : public nsIInputStreamCallback,