Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 17:55:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge m-c to autoland. a=merge

Browse Source
This commit is contained in:
Ryan VanderMeulen 2017-09-14 10:51:57 -04:00
commit 3078aab482
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/xpconnect/loader/mozJSSubScriptLoader.cpp
View File

@ -211,9 +211,11 @@ EvalScript(JSContext* cx,
// NOTE: If loadScope is already a shared-global JSM, we can't
// determine which JSM the target belongs to and have to assume it
// is in our JSM.
#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
JSObject* targetGlobal = js::GetGlobalForObjectCrossCompartment(targetObj);
MOZ_DIAGNOSTIC_ASSERT(!mozJSComponentLoader::Get()->IsLoaderGlobal(targetGlobal),
"Don't load subscript into target in a shared-global JSM");
#endif
if (!JS::CloneAndExecuteScript(cx, envChain, script, retval)) {
return false;
}