1 files changed, 36 insertions, 0 deletions
diff --git a/dom/cache/Manager.cpp b/dom/cache/Manager.cpp
index ef36309e13..68a19e5862 100644
--- a/dom/cache/Manager.cpp
+++ b/dom/cache/Manager.cpp
@@ -651,6 +651,15 @@ class Manager::CacheMatchAction final : public Manager::BaseAction {
                                         /* aCreate */ false)));
     }
 
+    // If we entered shutdown on the main thread while we were doing IO,
+    // bail out now.
+    if (AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownQM)) {
+      if (stream) {
+        stream->Close();
+      }
+      return NS_ERROR_ABORT;
+    }
+
     mStreamList->Add(mResponse.mBodyId, std::move(stream));
 
     return NS_OK;
@@ -718,6 +727,15 @@ class Manager::CacheMatchAllAction final : public Manager::BaseAction {
                                    /* aCreate */ false)));
       }
 
+      // If we entered shutdown on the main thread while we were doing IO,
+      // bail out now.
+      if (AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownQM)) {
+        if (stream) {
+          stream->Close();
+        }
+        return NS_ERROR_ABORT;
+      }
+
       mStreamList->Add(mSavedResponses[i].mBodyId, std::move(stream));
     }
 
@@ -1264,6 +1282,15 @@ class Manager::CacheKeysAction final : public Manager::BaseAction {
                                    /* aCreate */ false)));
       }
 
+      // If we entered shutdown on the main thread while we were doing IO,
+      // bail out now.
+      if (AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownQM)) {
+        if (stream) {
+          stream->Close();
+        }
+        return NS_ERROR_ABORT;
+      }
+
       mStreamList->Add(mSavedRequests[i].mBodyId, std::move(stream));
     }
 
@@ -1334,6 +1361,15 @@ class Manager::StorageMatchAction final : public Manager::BaseAction {
                                         /* aCreate */ false)));
     }
 
+    // If we entered shutdown on the main thread while we were doing IO,
+    // bail out now.
+    if (AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownQM)) {
+      if (stream) {
+        stream->Close();
+      }
+      return NS_ERROR_ABORT;
+    }
+
     mStreamList->Add(mSavedResponse.mBodyId, std::move(stream));
 
     return NS_OK;