From 5f2ddad73f4326c1659dfd2e455fad70dd73104a Mon Sep 17 00:00:00 2001 From: "dbradley%netscape.com" Date: Sat, 10 May 2003 04:10:29 +0000 Subject: [PATCH] bug 204659 - Security manager check needs adjusting. r=adamlock, sr=alecf, a=sspitzer git-svn-id: svn://10.0.0.236/trunk@142299 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp | 2 +- mozilla/js/src/xpconnect/src/nsDispatchSupport.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp b/mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp index 5f2c5b37209..4a3920be590 100644 --- a/mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp +++ b/mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp @@ -54,7 +54,7 @@ CommonConstructor(JSContext *cx, int name, JSObject *obj, uintN argc, nsIXPCSecurityManager* sm = ccx.GetXPCContext() ->GetAppropriateSecurityManager(nsIXPCSecurityManager::HOOK_CALL_METHOD); XPCWrappedNative * wrapper = ccx.GetWrapper(); - if(!sm || NS_FAILED(sm->CanAccess(nsIXPCSecurityManager::ACCESS_CALL_METHOD, + if(sm && NS_FAILED(sm->CanAccess(nsIXPCSecurityManager::ACCESS_CALL_METHOD, &ccx, ccx, ccx.GetFlattenedJSObject(), wrapper->GetIdentityObject(), wrapper->GetClassInfo(), diff --git a/mozilla/js/src/xpconnect/src/nsDispatchSupport.cpp b/mozilla/js/src/xpconnect/src/nsDispatchSupport.cpp index 31fd51f6a5e..970cda3458f 100644 --- a/mozilla/js/src/xpconnect/src/nsDispatchSupport.cpp +++ b/mozilla/js/src/xpconnect/src/nsDispatchSupport.cpp @@ -203,7 +203,7 @@ NS_IMETHODIMP nsDispatchSupport::IsClassSafeToHost(JSContext * cx, nsIXPCSecurityManager* sm = ccx.GetXPCContext()->GetAppropriateSecurityManager( nsIXPCSecurityManager::HOOK_CREATE_INSTANCE); - *aResult = sm && + *aResult = !sm || NS_SUCCEEDED(sm->CanCreateInstance(ccx, cid)); if(!*aResult)