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 960246 - Handle failures when executing frame scripts (r=smaug,bholley)

Browse Source
This commit is contained in:
Bill McCloskey 2014-01-16 11:43:01 -08:00
parent 5a8f6f7e94
commit 578b7c8594
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
content/base/src/nsFrameMessageManager.cpp
View File

@ -1410,6 +1410,7 @@ nsFrameScriptExecutor::LoadFrameScriptInternal(const nsAString& aURL,
JS::Rooted<JSObject*> global(cx, mGlobal->GetJSObject());
if (global) {
JSAutoCompartment ac(cx, global);
bool ok = true;
if (funobj) {
JS::Rooted<JSObject*> method(cx, JS_CloneFunctionObject(cx, funobj, global));
if (!method) {
@ -1417,10 +1418,14 @@ nsFrameScriptExecutor::LoadFrameScriptInternal(const nsAString& aURL,
}
JS::Rooted<JS::Value> rval(cx);
JS::Rooted<JS::Value> methodVal(cx, JS::ObjectValue(*method));
(void) JS_CallFunctionValue(cx, global, methodVal,
0, nullptr, rval.address());
ok = JS_CallFunctionValue(cx, global, methodVal,
0, nullptr, rval.address());
} else if (script) {
(void) JS_ExecuteScript(cx, global, script, nullptr);
ok = JS_ExecuteScript(cx, global, script, nullptr);
}
if (!ok) {
nsJSUtils::ReportPendingException(cx);
}
}
}