mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: crash on WebWorkerObserver script execution (#37050)

Browse source 
fix: crash on WebWorkerObserver script execution
This commit is contained in:
Shelley Vohr 2023-01-31 12:29:29 +01:00 • committed by GitHub
parent ce35bda805
commit 23739c644b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 109 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
shell/renderer/web_worker_observer.cc
View file

@ -4,7 +4,9 @@
#include "shell/renderer/web_worker_observer.h"
#include "base/lazy_instance.h"
#include <utility>
#include "base/no_destructor.h"
#include "base/threading/thread_local.h"
#include "shell/common/api/electron_bindings.h"
#include "shell/common/gin_helper/event_emitter_caller.h"
@ -15,28 +17,31 @@ namespace electron {
namespace {
static base::LazyInstance<
base::ThreadLocalPointer<WebWorkerObserver>>::DestructorAtExit lazy_tls =
LAZY_INSTANCE_INITIALIZER;
static base::NoDestructor<base::ThreadLocalOwnedPointer<WebWorkerObserver>>
lazy_tls;
} // namespace
// static
WebWorkerObserver* WebWorkerObserver::GetCurrent() {
WebWorkerObserver* self = lazy_tls.Pointer()->Get();
return self ? self : new WebWorkerObserver;
return lazy_tls->Get();
}
// static
WebWorkerObserver* WebWorkerObserver::Create() {
auto obs = std::make_unique<WebWorkerObserver>();
auto* obs_raw = obs.get();
lazy_tls->Set(std::move(obs));
return obs_raw;
}
WebWorkerObserver::WebWorkerObserver()
: node_bindings_(
NodeBindings::Create(NodeBindings::BrowserEnvironment::kWorker)),
electron_bindings_(
std::make_unique<ElectronBindings>(node_bindings_->uv_loop())) {
lazy_tls.Pointer()->Set(this);
}
std::make_unique<ElectronBindings>(node_bindings_->uv_loop())) {}
WebWorkerObserver::~WebWorkerObserver() {
lazy_tls.Pointer()->Set(nullptr);
// Destroying the node environment will also run the uv loop,
// Node.js expects `kExplicit` microtasks policy and will run microtasks
// checkpoints after every call into JavaScript. Since we use a different
@ -90,7 +95,8 @@ void WebWorkerObserver::ContextWillDestroy(v8::Local<v8::Context> context) {
if (env)
gin_helper::EmitEvent(env->isolate(), env->process_object(), "exit");
delete this;
if (lazy_tls->Get())
lazy_tls->Set(nullptr);
}
} // namespace electron