Bug 1306733: Don't crash on release builds if mTimer isn't set here. draft
authorByron Campen [:bwc] <docfaraday@gmail.com>
Fri, 30 Sep 2016 16:42:45 -0500
changeset 419769 ed2efb3979ae6b5d9ef25d406ace38bdd2df9445
parent 419507 5ffed033557e5b6f9694123f1948f867f913ede3
child 532649 d6756d16e63b5d37450c9fc4ca9e6c7ee3b53b12
push id31012
push userbcampen@mozilla.com
push dateFri, 30 Sep 2016 21:43:03 +0000
bugs1306733
milestone52.0a1
Bug 1306733: Don't crash on release builds if mTimer isn't set here. MozReview-Commit-ID: eupSpSpJU3
xpcom/threads/TimerThread.cpp
--- a/xpcom/threads/TimerThread.cpp
+++ b/xpcom/threads/TimerThread.cpp
@@ -265,17 +265,20 @@ nsTimerEvent::DeleteAllocatorIfNeeded()
     delete sAllocator;
     sAllocator = nullptr;
   }
 }
 
 NS_IMETHODIMP
 nsTimerEvent::Run()
 {
-  MOZ_ASSERT(mTimer);
+  if (!mTimer) {
+    MOZ_ASSERT(false);
+    return NS_OK;
+  }
 
   if (mGeneration != mTimer->GetGeneration()) {
     return NS_OK;
   }
 
   if (MOZ_LOG_TEST(GetTimerLog(), LogLevel::Debug)) {
     TimeStamp now = TimeStamp::Now();
     MOZ_LOG(GetTimerLog(), LogLevel::Debug,