From 5a625c1127c0951daf5e5f3d8f2602e95e7e42bc Mon Sep 17 00:00:00 2001
From: "timeless@mozdev.org" <timeless@mozdev.org>
Date: Wed, 12 Aug 2009 11:49:55 +0200
Subject: [PATCH] Bug 506637 nsFocusController::GetControllers does not handle
 a null nsIFocusManager* fm well r=smaug

---
 dom/base/nsFocusController.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dom/base/nsFocusController.cpp b/dom/base/nsFocusController.cpp
index 16e1c4fbd583..ec17b6231c3b 100644
--- a/dom/base/nsFocusController.cpp
+++ b/dom/base/nsFocusController.cpp
@@ -98,9 +98,12 @@ nsFocusController::GetControllers(nsIControllers** aResult)
   // knowledge of what object might have controllers.
   nsCOMPtr<nsIDOMElement> focusedElement;
   nsIFocusManager* fm = nsFocusManager::GetFocusManager();
-  if (fm)
-    fm->GetFocusedElement(getter_AddRefs(focusedElement));
+  if (!fm) {
+    *aResult = nsnull;
+    return NS_OK;
+  }
 
+  fm->GetFocusedElement(getter_AddRefs(focusedElement));
   if (focusedElement) {
 #ifdef MOZ_XUL
     nsCOMPtr<nsIDOMXULElement> xulElement(do_QueryInterface(focusedElement));