wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 630471 - Enter compartment when creating XPC stack frame, before JS_PCToLineNumber (r=gal)

Browse Source
This commit is contained in:
Steve Fink 2011-02-03 11:29:16 -08:00
parent 7b5ff04357
commit 8d967375c9
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
js/src/xpconnect/src/xpcstack.cpp
View File

@ -160,31 +160,35 @@ XPCJSStackFrame::CreateStack(JSContext* cx, JSStackFrame* fp,
jsbytecode* pc = JS_GetFramePC(cx, fp); jsbytecode* pc = JS_GetFramePC(cx, fp);
if(script && pc) if(script && pc)
{ {
const char* filename = JS_GetScriptFilename(cx, script); JSAutoEnterCompartment ac;
if(filename) if(ac.enter(cx, script))
{ {
self->mFilename = (char*) const char* filename = JS_GetScriptFilename(cx, script);
nsMemory::Clone(filename, if(filename)
sizeof(char)*(strlen(filename)+1));
}
self->mLineno = (PRInt32) JS_PCToLineNumber(cx, script, pc);
JSFunction* fun = JS_GetFrameFunction(cx, fp);
if(fun)
{
JSString *funid = JS_GetFunctionId(fun);
if(funid)
{ {
size_t length = JS_GetStringEncodingLength(cx, funid); self->mFilename = (char*)
if(length != size_t(-1)) nsMemory::Clone(filename,
sizeof(char)*(strlen(filename)+1));
}
self->mLineno = (PRInt32) JS_PCToLineNumber(cx, script, pc);
JSFunction* fun = JS_GetFrameFunction(cx, fp);
if(fun)
{
JSString *funid = JS_GetFunctionId(fun);
if(funid)
{ {
self->mFunname = static_cast<char *>(nsMemory::Alloc(length + 1)); size_t length = JS_GetStringEncodingLength(cx, funid);
if(self->mFunname) if(length != size_t(-1))
{ {
JS_EncodeStringToBuffer(funid, self->mFunname, length); self->mFunname = static_cast<char *>(nsMemory::Alloc(length + 1));
self->mFunname[length] = '\0'; if(self->mFunname)
{
JS_EncodeStringToBuffer(funid, self->mFunname, length);
self->mFunname[length] = '\0';
}
} }
} }
} }