Followup fix to 300008 (300867, r+a=me).

This commit is contained in:
brendan%mozilla.org 2005-07-15 06:24:22 +00:00
parent 3237d883cc
commit 5565b249e1

View File

@ -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 *)