Bug 986379 - Console crash for a mTimer set to null, r=ehsan
authorAndrea Marchesini <amarchesini@mozilla.com>
Fri, 21 Mar 2014 16:57:54 +0000
changeset 175168 fe6c589943402ab46cf1c2a83090e626508dee93
parent 175167 7f9fd179263eb4386cfd393b612c68a6a1ac61a7
child 175169 54c9f249fb7a241a0c27df147666863579fcac48
push id271
push userpvanderbeken@mozilla.com
push dateMon, 24 Mar 2014 22:43:42 +0000
reviewersehsan
bugs986379
milestone31.0a1
Bug 986379 - Console crash for a mTimer set to null, r=ehsan
dom/base/Console.cpp
--- a/dom/base/Console.cpp
+++ b/dom/base/Console.cpp
@@ -913,17 +913,17 @@ Console::Notify(nsITimer *timer)
     if (!data) {
       break;
     }
 
     ProcessCallData(data);
     delete data;
   }
 
-  if (mQueuedCalls.isEmpty()) {
+  if (mQueuedCalls.isEmpty() && mTimer) {
     mTimer->Cancel();
     mTimer = nullptr;
   }
 
   return NS_OK;
 }
 
 void