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

fix: dangling raw_ptr NodeBindings::uv_env_ (#42933)

Browse source
This commit is contained in:
Charles Kerr 2024-07-17 23:30:09 -05:00 committed by GitHub
parent bc345db351
commit 5773a2dce6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
shell/browser/electron_browser_main_parts.cc
View file

@ -604,6 +604,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun() {
node_env_->set_trace_sync_io(false); node_env_->set_trace_sync_io(false);
js_env_->DestroyMicrotasksRunner(); js_env_->DestroyMicrotasksRunner();
node::Stop(node_env_.get(), node::StopFlags::kDoNotTerminateIsolate); node::Stop(node_env_.get(), node::StopFlags::kDoNotTerminateIsolate);
node_bindings_->set_uv_env(nullptr);
node_env_.reset(); node_env_.reset();
auto default_context_key = ElectronBrowserContext::PartitionKey("", false); auto default_context_key = ElectronBrowserContext::PartitionKey("", false);

4
shell/browser/electron_browser_main_parts.h
View file

@ -155,10 +155,10 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
// Before then, we just exit() without any intermediate steps. // Before then, we just exit() without any intermediate steps.
std::optional<int> exit_code_; std::optional<int> exit_code_;
std::unique_ptr<NodeBindings> node_bindings_; const std::unique_ptr<NodeBindings> node_bindings_;
// depends-on: node_bindings_ // depends-on: node_bindings_
std::unique_ptr<ElectronBindings> electron_bindings_; const std::unique_ptr<ElectronBindings> electron_bindings_;
// depends-on: node_bindings_ // depends-on: node_bindings_
std::unique_ptr<JavascriptEnvironment> js_env_; std::unique_ptr<JavascriptEnvironment> js_env_;