Bug 1066718 - Get sIOService before invoking ReadPrefs. r=bz, a=sledru
authorBobby Holley <bobbyholley@gmail.com>
Tue, 16 Sep 2014 21:30:32 +0200
changeset 224887 d7ad9b5167d82d3bffd16b98d4d93d6c1815003a
parent 224886 464e58c748413bda00c273c8a228af04aff5b8fb
child 224888 a67e850f9376b0ca0bcfaf8864d6da6cd57ca1fa
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, sledru
bugs1066718
milestone34.0a2
Bug 1066718 - Get sIOService before invoking ReadPrefs. r=bz, a=sledru
caps/nsScriptSecurityManager.cpp
--- a/caps/nsScriptSecurityManager.cpp
+++ b/caps/nsScriptSecurityManager.cpp
@@ -1276,21 +1276,21 @@ nsScriptSecurityManager::nsScriptSecurit
 {
     static_assert(sizeof(intptr_t) == sizeof(void*),
                   "intptr_t and void* have different lengths on this platform. "
                   "This may cause a security failure with the SecurityLevel union.");
 }
 
 nsresult nsScriptSecurityManager::Init()
 {
-    InitPrefs();
-
     nsresult rv = CallGetService(NS_IOSERVICE_CONTRACTID, &sIOService);
     NS_ENSURE_SUCCESS(rv, rv);
 
+    InitPrefs();
+
     nsCOMPtr<nsIStringBundleService> bundleService =
         mozilla::services::GetStringBundleService();
     if (!bundleService)
         return NS_ERROR_FAILURE;
 
     rv = bundleService->CreateBundle("chrome://global/locale/security/caps.properties", &sStrBundle);
     NS_ENSURE_SUCCESS(rv, rv);