[tbb-commits] [tor-browser/tor-browser-68.6.0esr-9.0-1] Bug 1626728 - Normalize shutdown. r=perry, jstutte, a=RyanVM

[sysrqb at torproject.org]

commit 0e0085c0d8aa0ba4141d53bcecf525f443ef3a59
Author: Andrew Sutherland <asutherland at asutherland.org>
Date:   Fri Apr 3 06:35:19 2020 +0000

    Bug 1626728 - Normalize shutdown. r=perry,jstutte, a=RyanVM
    
    Differential Revision: https://phabricator.services.mozilla.com/D69463
    
    --HG--
    branch : FIREFOX_ESR_68_6_X_RELBRANCH
    extra : source : 63afe468c6a580c6c01623fd60c8393fc2c2a4e0
---
 dom/cache/StreamList.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dom/cache/StreamList.cpp b/dom/cache/StreamList.cpp
index 9f817457ffb5..894fb8bdd575 100644
--- a/dom/cache/StreamList.cpp
+++ b/dom/cache/StreamList.cpp
@@ -133,7 +133,15 @@ void StreamList::Close(const nsID& aId) {
 void StreamList::CloseAll() {
   NS_ASSERT_OWNINGTHREAD(StreamList);
   if (mStreamControl) {
-    mStreamControl->CloseAll();
+    auto streamControl = mStreamControl;
+    mStreamControl = nullptr;
+
+    streamControl->CloseAll();
+
+    mStreamControl = streamControl;
+    streamControl = nullptr;
+
+    mStreamControl->Shutdown();
   }
 }