Bug 1346426 Don't crash if a window is frozen while there is a dummy …

…timer in the list. r=ehsan
dothq · Mar 13, 2017 · ded5d4f · ded5d4f
1 parent 004811f
commit ded5d4f
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/dom/base/TimeoutManager.cpp b/dom/base/TimeoutManager.cpp
@@ -1198,8 +1198,16 @@ TimeoutManager::Freeze()
   MOZ_LOG(gLog, LogLevel::Debug,
           ("Freeze(TimeoutManager=%p)\n", this));
 
+  DebugOnly<bool> _seenDummyTimeout = false;
+
   TimeStamp now = TimeStamp::Now();
   ForEachUnorderedTimeout([&](Timeout* aTimeout) {
+    if (!aTimeout->mWindow) {
+      NS_ASSERTION(!_seenDummyTimeout, "More than one dummy timeout?!");
+      _seenDummyTimeout = true;
+      return;
+    }
+
     // Save the current remaining time for this timeout.  We will
     // re-apply it when the window is Thaw()'d.  This effectively
     // shifts timers to the right as if time does not pass while