From 242b69fa40487e9302c3e2056eb02bab10cd2e44 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 12 Apr 2005 15:25:41 +0000
Subject: [PATCH] Throw from our Init() method if we're already initialized, so
 we don't add ourselves to various lists twice.  Bug 282784, r=kaie, sr=jst,
 a=asa

git-svn-id: svn://10.0.0.236/trunk@172024 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../manager/boot/src/nsSecureBrowserUIImpl.cpp      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp b/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
index 5eafd4340ee..cc8709d1762 100644
--- a/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
+++ b/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
@@ -177,8 +177,19 @@ NS_IMETHODIMP
 nsSecureBrowserUIImpl::Init(nsIDOMWindow *window)
 {
   PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
-         ("SecureUI:%p: Init\n", this));
+         ("SecureUI:%p: Init: mWindow: %p, window: %p\n", this, mWindow.get(),
+          window));
 
+  if (!window) {
+    NS_WARNING("Null window passed to nsSecureBrowserUIImpl::Init()");
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  if (mWindow) {
+    NS_WARNING("Trying to init an nsSecureBrowserUIImpl twice");
+    return NS_ERROR_ALREADY_INITIALIZED;
+  }
+  
   nsresult rv = NS_OK;
   mWindow = window;