Bug 767948 - Make assertion nonfatal. r=me
authorBobby Holley <bobbyholley@gmail.com>
Mon, 25 Jun 2012 15:24:21 +0200
changeset 100283 7eb665a56c55fbee72543101e5e7ed4ba807389f
parent 100282 23818f9b65a2a2f44d0301f30eabacd4e0a58faa
child 100284 d3da23241bbaa867eca0809f9f24ae2a275d8342
push id1729
push userlsblakk@mozilla.com
push dateMon, 16 Jul 2012 20:02:43 +0000
treeherdermozilla-aurora@f4e75e148951 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs767948
milestone16.0a1
Bug 767948 - Make assertion nonfatal. r=me
js/xpconnect/wrappers/AccessCheck.cpp
--- a/js/xpconnect/wrappers/AccessCheck.cpp
+++ b/js/xpconnect/wrappers/AccessCheck.cpp
@@ -444,17 +444,17 @@ PermitIfUniversalXPConnect(JSContext *cx
     nsIScriptSecurityManager *ssm = XPCWrapper::GetSecurityManager();
     if (!ssm) {
         return false;
     }
 
     // Double-check that the subject principal according to CAPS is a content
     // principal rather than the system principal. If it isn't, this check is
     // meaningless.
-    MOZ_ASSERT(!AccessCheck::callerIsChrome());
+    NS_ASSERTION(!AccessCheck::callerIsChrome(), "About to do a meaningless security check!");
 
     bool privileged;
     if (NS_SUCCEEDED(ssm->IsCapabilityEnabled("UniversalXPConnect", &privileged)) &&
         privileged) {
         perm = ExposedPropertiesOnly::PermitPropertyAccess;
         return true; // Allow
     }