fix bug 55506. If seman was initialized too early then it was failing to register its nameset. This happened on first run when JS Component Loader would use the secman. The result was that all calls to the security manager via JavaScript would fail for that session. This fixes that by continuing to try to register the nameset until it actually succeeds. r=mstoltz a=brendan

caps/include/nsScriptSecurityManager.h

@@ -140,6 +140,9 @@ private:
     NS_IMETHOD
     InitPrefs();
 
+    PRBool
+    EnsureNameSetRegistered();
+
     static nsresult 
     PrincipalPrefNames(const char* pref, char** grantedPref, char** deniedPref);
 
@@ -166,6 +169,7 @@ private:
     PRBool mIsWritingPrefs;
     unsigned char hasDomainPolicyVector[(NS_DOM_PROP_MAX >> 3) + 1];
     nsCOMPtr<nsIJSContextStack> mThreadJSContextStack;
+    PRBool mNameSetRegistered;
 };
 
 #endif /*_NS_SCRIPT_SECURITY_MANAGER_H_*/

caps/src/nsScriptSecurityManager.cpp

@@ -765,10 +765,43 @@ nsScriptSecurityManager::GetCodebasePrincipal(nsIURI *aURI,
     return NS_OK;
 }
 
+PRBool
+nsScriptSecurityManager::EnsureNameSetRegistered()
+{
+    // Confirm that our nameset is registered. We used to do this only when the 
+    // secman was first created. But it turns out that it is possible for code
+    // to force instatiation of the security manager *before* the namespace
+    // registry is available. In that case we would fail to register our
+    // nameset and never try again. Now we keep trying until it succeeds.
+    
+    if (!mNameSetRegistered) {
+        nsresult rv;
+        NS_WITH_SERVICE(nsIScriptNameSetRegistry, registry, 
+                        kCScriptNameSetRegistryCID, &rv);
+        if (NS_SUCCEEDED(rv)) {
+            nsSecurityNameSet* nameSet = new nsSecurityNameSet();
+            if (nameSet) {
+                rv = registry->AddExternalNameSet(nameSet);
+                if (NS_SUCCEEDED(rv)) {
+                    mNameSetRegistered = PR_TRUE;
+#ifdef DEBUG_jband
+                    printf("##### security manager nameset registered\n");
+#endif
+                }
+            }
+        }
+    }
+    return mNameSetRegistered;
+}
+
 NS_IMETHODIMP
 nsScriptSecurityManager::CanExecuteScripts(nsIPrincipal *principal,
                                            PRBool *result)
 {
+    // XXX Really OK to fail? 
+    // I suppose that in some embedding there may be no ScriptNameSetRegistry.
+    EnsureNameSetRegistered();
+
     if (principal == mSystemPrincipal) {
          // Even if JavaScript is disabled, we must still execute system scripts
         *result = PR_TRUE;
@@ -1464,7 +1497,9 @@ nsScriptSecurityManager::nsScriptSecurityManager(void)
       mSystemPrincipal(nsnull), mPrincipals(nsnull), 
       mIsJavaScriptEnabled(PR_FALSE),
       mIsMailJavaScriptEnabled(PR_FALSE),
-      mIsWritingPrefs(PR_FALSE)
+      mIsWritingPrefs(PR_FALSE),
+      mNameSetRegistered(PR_FALSE)
+
 {
     NS_INIT_REFCNT();
     memset(hasDomainPolicyVector, 0, sizeof(hasDomainPolicyVector));
@@ -1487,13 +1522,13 @@ nsScriptSecurityManager::GetScriptSecurityManager()
         ssecMan = new nsScriptSecurityManager();
         if (!ssecMan)
             return NULL;
-	    nsresult rv;
+        nsresult rv;
-	    NS_WITH_SERVICE(nsIScriptNameSetRegistry, registry, 
+
-                        kCScriptNameSetRegistryCID, &rv);
+        // Try to register the nameset. This can sometimes fail on first run
-        if (NS_SUCCEEDED(rv)) {
+        // when the nameset service is not yet available at the time when 
-            nsSecurityNameSet* nameSet = new nsSecurityNameSet();
+        // the script security manager is created. That is OK. We will try 
-            registry->AddExternalNameSet(nameSet);
+        // again when CanExecuteSCripts is called if necessary.
-        }
+        ssecMan->EnsureNameSetRegistered();
 
         NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
         if (NS_SUCCEEDED(rv) && xpc) {