Bug 1421793 - nsPACMan needs to be shutdown before dtor; r?schien draft
authorLiang-Heng Chen <xeonchen@gmail.com>
Fri, 01 Dec 2017 15:10:36 +0800
changeset 706072 7253157003274e089a11f91cad354b04735b1027
parent 706025 a21f4e2ce5186e2dc9ee411b07e9348866b4ef30
child 742559 a1bb9ab2e93cdc6c7aea6b22887f954d9fae37c5
push id91689
push userbmo:xeonchen@mozilla.com
push dateFri, 01 Dec 2017 07:12:04 +0000
reviewersschien
bugs1421793
milestone59.0a1
Bug 1421793 - nsPACMan needs to be shutdown before dtor; r?schien MozReview-Commit-ID: D2aKTC8s9MQ
netwerk/base/nsProtocolProxyService.cpp
--- a/netwerk/base/nsProtocolProxyService.cpp
+++ b/netwerk/base/nsProtocolProxyService.cpp
@@ -1161,18 +1161,20 @@ nsProtocolProxyService::SetupPACThread(n
         NS_SUCCEEDED(mSystemProxySettings->GetMainThreadOnly(&mainThreadOnly)) &&
         !mainThreadOnly) {
         rv = mPACMan->Init(mSystemProxySettings);
     }
     else {
         rv = mPACMan->Init(nullptr);
     }
 
-    if (NS_FAILED(rv))
+    if (NS_FAILED(rv)) {
+        mPACMan->Shutdown();
         mPACMan = nullptr;
+    }
     return rv;
 }
 
 nsresult
 nsProtocolProxyService::ResetPACThread()
 {
     if (!mPACMan)
         return NS_OK;