Commit 7b45a8e4 authored by bzbarsky%mit.edu's avatar bzbarsky%mit.edu
Browse files

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
parent ac19c30c

caps/src/nsScriptSecurityManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

            }

        }