From 3ef1503a5f7ea3464135d81f5dad657ab0be457b Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 12 Apr 2005 05:13:26 +0000
Subject: [PATCH] Fix crashes when privilegeManager methods are called by
 setting our our param on success return.  Bug 289991 and bug 289925,
 r=caillon, sr=dbaron, a=dbaron

git-svn-id: svn://10.0.0.236/trunk@172019 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/caps/src/nsScriptSecurityManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp
index fc654ad24d4..ecf183cc678 100644
--- a/mozilla/caps/src/nsScriptSecurityManager.cpp
+++ b/mozilla/caps/src/nsScriptSecurityManager.cpp
@@ -657,8 +657,7 @@ nsScriptSecurityManager::CheckPropertyAccessImpl(PRUint32 aAction,
                 nsCOMPtr<nsIPrincipal> objectPrincipal;
                 if(aJSObject)
                 {
-                    objectPrincipal =
-                        doGetObjectPrincipal(cx, aJSObject);
+                    objectPrincipal = doGetObjectPrincipal(cx, aJSObject);
                     if (!objectPrincipal)
                         return NS_ERROR_FAILURE;
                 }
@@ -1910,6 +1909,7 @@ nsScriptSecurityManager::GetPrincipalAndFrame(JSContext *cx,
             if (result)
             {
                 NS_ASSERTION(NS_SUCCEEDED(*rv), "Weird return");
+                *frameResult = fp;
                 return result;
             }
         }