mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 05:15:45 +00:00
Followup fix to 300008 (300867, r+a=me).
This commit is contained in:
parent
3237d883cc
commit
5565b249e1
@ -714,10 +714,10 @@ JS_EvalFramePrincipals(JSContext *cx, JSStackFrame *fp, JSStackFrame *caller)
|
||||
if (!caller)
|
||||
return principals;
|
||||
callerPrincipals = JS_StackFramePrincipals(cx, caller);
|
||||
return (principals && callerPrincipals &&
|
||||
principals->subsume(principals, callerPrincipals))
|
||||
? callerPrincipals
|
||||
: principals;
|
||||
return (callerPrincipals && principals &&
|
||||
callerPrincipals->subsume(callerPrincipals, principals))
|
||||
? principals
|
||||
: callerPrincipals;
|
||||
}
|
||||
|
||||
JS_PUBLIC_API(void *)
|
||||
|
Loading…
Reference in New Issue
Block a user