Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a shiny new API for propagating uncaught exceptions. bug 328161, r=brendan sr=shaver

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@199173 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mrbkap%gmail.com 2006-06-07 00:19:29 +00:00
parent b03f0316c3
commit 88979897f4
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/js/src/xpconnect/src/xpccomponents.cpp
View File

@ -2312,18 +2312,6 @@ nsXPCComponents_utils_Sandbox::CallOrConstruct(nsIXPConnectWrappedNative *wrappe
/***************************************************************************/
/*
* Throw an exception on caller_cx that is made from message and report,
* which were reported as uncaught on cx.
*/
static void
SandboxErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
{
JSContext *caller_cx = NS_STATIC_CAST(JSContext*, JS_GetContextPrivate(cx));
JS_ThrowReportedError(caller_cx, message, report);
}
/* void evalInSandbox(in AString source, in nativeobj sandbox); */
NS_IMETHODIMP
nsXPCComponents_Utils::EvalInSandbox(const nsAString &source)
@ -2395,6 +2383,7 @@ nsXPCComponents_Utils::EvalInSandbox(const nsAString &source)
return NS_ERROR_OUT_OF_MEMORY;
}
JS_SetOptions(sandcx, JSOPTION_DONT_REPORT_UNCAUGHT);
JS_SetGlobalObject(sandcx, sandbox);
XPCPerThreadData *data = XPCPerThreadData::GetData();
@ -2411,18 +2400,6 @@ nsXPCComponents_Utils::EvalInSandbox(const nsAString &source)
popContext = PR_TRUE;
}
// Capture uncaught exceptions reported as errors on sandcx and
// re-throw them on cx.
JS_SetContextPrivate(sandcx, cx);
JS_SetErrorReporter(sandcx, SandboxErrorReporter);
// Push a fake frame onto sandcx so that we can properly propagate uncaught
// exceptions.
JSStackFrame frame;
memset(&frame, 0, sizeof frame);
NS_STATIC_CAST(JSContext *, sandcx)->fp = &frame;
// Get the current source info from xpc. Use the codebase as a fallback,
// though.
nsXPIDLCString filename;