Bug 802557 - Bustage fix on esr10. r=bz, a=bustage
authorBobby Holley <bobbyholley@gmail.com>
Tue, 23 Oct 2012 18:09:31 +0200
changeset 82044 185e090a2616345cf0d6071dfbe718eeb5921232
parent 82043 39677d1cfacb9a596259f4578463c74941cdcbb7
child 82045 2a1fc60b2b5d96d249ed0327988ef1c932e16818
push id307
push userbobbyholley@gmail.com
push dateTue, 23 Oct 2012 16:10:04 +0000
reviewersbz, bustage
bugs802557
milestone10.0.10esrpre
Bug 802557 - Bustage fix on esr10. r=bz, a=bustage
dom/base/nsLocation.cpp
--- a/dom/base/nsLocation.cpp
+++ b/dom/base/nsLocation.cpp
@@ -1048,10 +1048,10 @@ nsLocation::CallerSubsumes()
   // Get the principal associated with the location object.
   nsCOMPtr<nsIDOMWindow> outer = do_QueryReferent(mOuter);
   if (NS_UNLIKELY(!outer))
     return false;
   nsCOMPtr<nsIScriptObjectPrincipal> sop = do_QueryInterface(outer);
   bool subsumes = false;
   nsresult rv = nsContentUtils::GetSubjectPrincipal()->Subsumes(sop->GetPrincipal(), &subsumes);
   NS_ENSURE_SUCCESS(rv, false);
-  return subsumes;
+  return subsumes || nsContentUtils::IsCallerTrustedForCapability("UniversalXPConnect");
 }