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
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user