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 1068163 - Turn off release-mode assertion against addon scope prototype munging. r=me

Browse Source
This commit is contained in:
Bobby Holley 2014-09-16 22:06:51 +02:00
parent bc48dc5b1b
commit cdc07c784e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/xpconnect/src/XPCJSRuntime.cpp
View File

@ -587,7 +587,13 @@ AddonWindowOrNull(JSObject *aObj)
// Addons could theoretically change the prototype of the addon scope, but
// we pretty much just want to crash if that happens so that we find out
// about it and get them to change their code.
MOZ_RELEASE_ASSERT(js::IsCrossCompartmentWrapper(proto));
//
// XXXbholley - Except unfortunately, that breaks the world right now. See
// bug 1068163.
if (!js::IsCrossCompartmentWrapper(proto)) {
NS_WARNING("An addon modified its global prototype - it likely won't work right!");
return nullptr;
}
JSObject *mainGlobal = js::UncheckedUnwrap(proto, /* stopAtOuter = */ false);
MOZ_RELEASE_ASSERT(JS_IsGlobalObject(mainGlobal));