From 27f4d0b5a50e6808ae7de14e1812d775d0754258 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 1 Jul 2020 21:12:16 +0000 Subject: [PATCH] Issue #618 - Check for failed instantiation when starting to fetch dependencies If instantiation has failed, then also fail the load and don't fetch imports. Ref BZ: 1358882 --- dom/script/ScriptLoader.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp index adc046b7c4..ffbe37f281 100644 --- a/dom/script/ScriptLoader.cpp +++ b/dom/script/ScriptLoader.cpp @@ -721,6 +721,12 @@ ScriptLoader::StartFetchingModuleDependencies(ModuleLoadRequest* aRequest) { MOZ_ASSERT(aRequest->mModuleScript); MOZ_ASSERT(!aRequest->IsReadyToRun()); + + if (aRequest->mModuleScript->InstantiationFailed()) { + aRequest->LoadFailed(); + return; + } + aRequest->mProgress = ModuleLoadRequest::Progress::FetchingImports; nsCOMArray urls;