Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 19:33:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 321522: The sandbox object needs to come from a new context, not the old

Browse Source 
context. r=shaver sr=brendan
This commit is contained in:
mrbkap%gmail.com 2006-01-06 22:28:18 +00:00
parent 93383ac1ed
commit b694b9110c
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/xpconnect/src/xpccomponents.cpp
View File

@ -2246,7 +2246,11 @@ nsXPCComponents_utils_Sandbox::CallOrConstruct(nsIXPConnectWrappedNative *wrappe
if(NS_FAILED(rv))
return ThrowAndFail(NS_ERROR_XPC_UNEXPECTED, cx, _retval);
JSObject *sandbox = JS_NewObject(cx, &SandboxClass, nsnull, nsnull);
XPCAutoJSContext tempcx(JS_NewContext(JS_GetRuntime(cx), 1024), PR_FALSE);
if (!tempcx)
return ThrowAndFail(NS_ERROR_OUT_OF_MEMORY, cx, _retval);
JSObject *sandbox = JS_NewObject(tempcx, &SandboxClass, nsnull, nsnull);
if (!sandbox)
return ThrowAndFail(NS_ERROR_XPC_UNEXPECTED, cx, _retval);

28
js/src/xpconnect/src/xpcprivate.h
View File

@ -388,6 +388,34 @@ private:
static void operator delete(void* /*memory*/) {}
};
// A helper class to deal with temporary JS contexts. It destroys the context
// when it goes out of scope.
class XPCAutoJSContext
{
public:
XPCAutoJSContext(JSContext *aContext, PRBool aGCOnDestroy)
: mContext(aContext), mGCOnDestroy(aGCOnDestroy)
{
}
~XPCAutoJSContext()
{
if(!mContext)
return;
if(mGCOnDestroy)
JS_DestroyContext(mContext);
else
JS_DestroyContextNoGC(mContext);
}
operator JSContext * () {return mContext;}
private:
JSContext *mContext;
PRBool mGCOnDestroy;
};
/***************************************************************************
****************************************************************************
*