Bug 679626 crash in nsIDOMWindowInternal::GetDocShell with signature …

…pointing to nsASDOMWindowEnumerator::GetNext - try to avoid windows with no docshells. r=bz
dothq · Oct 2, 2012 · 6336771 · 6336771
1 parent 1740ce1
commit 6336771
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp b/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp
@@ -222,11 +222,12 @@ NS_IMETHODIMP nsASDOMWindowEnumerator::GetNext(nsISupports **retval)
     return NS_ERROR_INVALID_ARG;
 
   *retval = nullptr;
-  if (mCurrentPosition) {
+  while (mCurrentPosition) {
     nsCOMPtr<nsIDOMWindow> domWindow;
     GetDOMWindow(mCurrentPosition->mWindow, domWindow);
-    CallQueryInterface(domWindow, retval);
     mCurrentPosition = FindNext();
+    if (domWindow)
+      return CallQueryInterface(domWindow, retval);
   }
   return NS_OK;
 }