Commit 3df83ae2 authored by Andrew McCreight's avatar Andrew McCreight
Browse files

Bug 1663315 - Don't load new JSMs during shutdown. r=kmag, a=RyanVM

Under unknown circumstances, we can end up running chrome
JS during thread manager shutdown. Sometimes this ends up
trying to load new JSMs, but gJarHandler has already been
cleared, leading to a crash.

To avoid this and other issues, this patch forbids the
importing of new JSMs after we're late enough in shutdown
to have cleared the ClearOnShutdown pointers. I allow the
importing of JSMs that have already been loaded, as that
seems like it should be okay.

Differential Revision:
parent bbfba64f
......@@ -49,6 +49,7 @@
#include "mozilla/scache/StartupCache.h"
#include "mozilla/scache/StartupCacheUtils.h"
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/MacroForEach.h"
#include "mozilla/Preferences.h"
#include "mozilla/ResultExtensions.h"
......@@ -307,6 +308,9 @@ mozJSComponentLoader::~mozJSComponentLoader() {
StaticRefPtr<mozJSComponentLoader> mozJSComponentLoader::sSelf;
// True if ShutdownPhase::ShutdownFinal has been reached.
static bool sShutdownFinal = false;
nsresult mozJSComponentLoader::ReallyInit() {
......@@ -516,6 +520,8 @@ void mozJSComponentLoader::FindTargetObject(JSContext* aCx,
void mozJSComponentLoader::InitStatics() {
sSelf = new mozJSComponentLoader();
RunOnShutdown([&] { sShutdownFinal = true; });
void mozJSComponentLoader::Unload() {
......@@ -1217,6 +1223,12 @@ nsresult mozJSComponentLoader::Import(JSContext* aCx,
UniquePtr<ModuleEntry> newEntry;
if (!mImports.Get(info.Key(), &mod) &&
!mInProgressImports.Get(info.Key(), &mod)) {
// We're trying to import a new JSM, but we're late in shutdown and this
// will likely not succeed and might even crash, so fail here.
if (sShutdownFinal) {
newEntry = MakeUnique<ModuleEntry>(RootingContext::get(aCx));
// Note: This implies EnsureURI().
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment