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 979481 - Don't depend on the default global for the SafeJSContext in nsJSUtils::ReportPendingException. r=bz

Browse Source
This commit is contained in:
Bobby Holley 2014-03-26 10:59:03 -03:00
parent 2eb7cd279e
commit ed41a09c4d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/base/nsJSUtils.cpp
View File

@ -120,6 +120,12 @@ nsJSUtils::ReportPendingException(JSContext *aContext)
JS::Rooted<JSObject*> scope(aContext);
scope = scx ? scx->GetWindowProxy()
: js::DefaultObjectForContextOrNull(aContext);
if (!scope) {
// The SafeJSContext has no default object associated with it.
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aContext == nsContentUtils::GetSafeJSContext());
scope = xpc::GetSafeJSContextGlobal();
}
JSAutoCompartment ac(aContext, scope);
JS_ReportPendingException(aContext);
}