Bug 1205339 - null out sIPCServingParent on teardown, to not assert on tab crash recovery. r=jesup
authorJan-Ivar Bruaroey <jib@mozilla.com>
Wed, 16 Sep 2015 13:47:07 -0400
changeset 297362 3d71fe7036fff7a0233904782cca9e000563d3d3
parent 297361 3627a5fcfd4fd70bd6c35dc4d8929b9db9413afc
child 297363 4c9d2dab60f3111024ce85d61a6c3bb3c4a706b4
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1205339
milestone43.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 1205339 - null out sIPCServingParent on teardown, to not assert on tab crash recovery. r=jesup
dom/media/systemservices/MediaParent.cpp
--- a/dom/media/systemservices/MediaParent.cpp
+++ b/dom/media/systemservices/MediaParent.cpp
@@ -540,16 +540,17 @@ AllocPMediaParent()
   return sIPCServingParent;
 }
 
 bool
 DeallocPMediaParent(media::PMediaParent *aActor)
 {
   MOZ_ASSERT(sIPCServingParent == static_cast<Parent<PMediaParent>*>(aActor));
   delete sIPCServingParent;
+  sIPCServingParent = nullptr;
   return true;
 }
 
 } // namespace media
 } // namespace mozilla
 
 // Instantiate templates to satisfy linker
 template class mozilla::media::Parent<mozilla::media::NonE10s>;