From d59e07a06e12716db68b291847def3bd5fc24aac Mon Sep 17 00:00:00 2001 From: "sudu%netscape.com" Date: Thu, 17 Sep 1998 18:12:52 +0000 Subject: [PATCH] New caps manager related changes git-svn-id: svn://10.0.0.236/trunk@10279 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/lib/libmocha/lm_taint.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mozilla/lib/libmocha/lm_taint.c b/mozilla/lib/libmocha/lm_taint.c index 586fa3ee2a3..2141877ca62 100644 --- a/mozilla/lib/libmocha/lm_taint.c +++ b/mozilla/lib/libmocha/lm_taint.c @@ -509,6 +509,7 @@ lm_CheckPermissions(JSContext *cx, JSObject *obj, JSTarget target) JSPrincipals *principals; JSBool result; + /* May be in a layer loaded from a different origin.*/ subjectOrigin = lm_GetSubjectOriginURL(cx); @@ -1653,14 +1654,9 @@ LM_SetUntransformedSource(JSPrincipals *principals, char *original, } JSPrincipals * PR_CALLBACK -LM_GetJSPrincipalsFromJavaCaller(JSContext *cx, int callerDepth) +LM_GetJSPrincipalsFromJavaCaller(JSContext *cx, void *principalsArray) { - void *principalsArray; - setupJSCapsCallbacks(); - - principalsArray = nsCapsGetClassPrincipalsFromStack(cx, callerDepth); - if (principalsArray == NULL) return NULL;