From 060752fb8ef5d835337926290b8eec6a77ab6058 Mon Sep 17 00:00:00 2001
From: "Byron Campen [:bwc]" <docfaraday@gmail.com>
Date: Fri, 30 Sep 2016 16:42:45 -0500
Subject: [PATCH] Bug 1306733: Don't crash on release builds if mTimer isn't
 set here. r=froydnj

MozReview-Commit-ID: eupSpSpJU3

--HG--
extra : rebase_source : d943f86b4bc015011f04f26fc8c2190f2472d111
---
 xpcom/threads/TimerThread.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xpcom/threads/TimerThread.cpp b/xpcom/threads/TimerThread.cpp
index b1d098c301ac..bdf43dbd26ae 100644
--- a/xpcom/threads/TimerThread.cpp
+++ b/xpcom/threads/TimerThread.cpp
@@ -270,7 +270,10 @@ nsTimerEvent::DeleteAllocatorIfNeeded()
 NS_IMETHODIMP
 nsTimerEvent::Run()
 {
-  MOZ_ASSERT(mTimer);
+  if (!mTimer) {
+    MOZ_ASSERT(false);
+    return NS_OK;
+  }
 
   if (mGeneration != mTimer->GetGeneration()) {
     return NS_OK;