Bug 1210077 - Null check gNeckoChild in HttpChannelChild::ResetInterception(); r=mcmanus
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 07 Oct 2015 18:01:24 -0400
changeset 266703 ac45ff7a16bc18996e834544855731c15d24ab6e
parent 266702 6aea4cfe56d505d0193e516375c3060472b9f3bf
child 266704 d4615c7b81773199a71de413efdc3d2fda103fac
push id66267
push usereakhgari@mozilla.com
push dateThu, 08 Oct 2015 04:19:08 +0000
treeherdermozilla-inbound@ac45ff7a16bc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcmanus
bugs1210077
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1210077 - Null check gNeckoChild in HttpChannelChild::ResetInterception(); r=mcmanus
netwerk/protocol/http/HttpChannelChild.cpp
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -2237,16 +2237,18 @@ HttpChannelChild::DivertToParent(Channel
   *aChild = static_cast<ChannelDiverterChild*>(diverter);
 
   return NS_OK;
 }
 
 void
 HttpChannelChild::ResetInterception()
 {
+  NS_ENSURE_TRUE_VOID(gNeckoChild != nullptr);
+
   if (mInterceptListener) {
     mInterceptListener->Cleanup();
   }
   mInterceptListener = nullptr;
 
   // The chance to intercept any further requests associated with this channel
   // (such as redirects) has passed.
   mLoadFlags |= LOAD_BYPASS_SERVICE_WORKER;