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

fix: dangling raw_ptr<Session> in UserDataLink (#42852)

Browse source 
* fix: dangling raw_ptr<Session> in UserDataLink

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* fixup! fix: dangling raw_ptr<Session> in UserDataLink

Co-authored-by: Charles Kerr <charles@charleskerr.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot] 2024-07-11 14:53:06 +02:00 committed by GitHub
parent 217e740791
commit e768a1f228
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
shell/browser/api/electron_api_session.cc
View file

@ -530,9 +530,10 @@ class DictionaryObserver final : public SpellcheckCustomDictionary::Observer {
#endif // BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER) #endif // BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
struct UserDataLink : base::SupportsUserData::Data { struct UserDataLink : base::SupportsUserData::Data {
explicit UserDataLink(Session* ses) : session(ses) {} explicit UserDataLink(base::WeakPtr<Session> session_in)
: session{std::move(session_in)} {}
raw_ptr<Session> session; base::WeakPtr<Session> session;
}; };
const void* kElectronApiSessionKey = &kElectronApiSessionKey; const void* kElectronApiSessionKey = &kElectronApiSessionKey;
@ -552,8 +553,9 @@ Session::Session(v8::Isolate* isolate, ElectronBrowserContext* browser_context)
protocol_.Reset(isolate, Protocol::Create(isolate, browser_context).ToV8()); protocol_.Reset(isolate, Protocol::Create(isolate, browser_context).ToV8());
browser_context->SetUserData(kElectronApiSessionKey, browser_context->SetUserData(
std::make_unique<UserDataLink>(this)); kElectronApiSessionKey,
std::make_unique<UserDataLink>(weak_factory_.GetWeakPtr()));
#if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER) #if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
SpellcheckService* service = SpellcheckService* service =
@ -1512,7 +1514,7 @@ bool Session::IsSpellCheckerEnabled() const {
Session* Session::FromBrowserContext(content::BrowserContext* context) { Session* Session::FromBrowserContext(content::BrowserContext* context) {
auto* data = auto* data =
static_cast<UserDataLink*>(context->GetUserData(kElectronApiSessionKey)); static_cast<UserDataLink*>(context->GetUserData(kElectronApiSessionKey));
return data ? data->session : nullptr; return data ? data->session.get() : nullptr;
} }
// static // static

5
shell/browser/api/electron_api_session.h
View file

@ -10,6 +10,7 @@
#include <vector> #include <vector>
#include "base/memory/raw_ptr.h" #include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h" #include "base/values.h"
#include "content/public/browser/download_manager.h" #include "content/public/browser/download_manager.h"
#include "electron/buildflags/buildflags.h" #include "electron/buildflags/buildflags.h"
@ -215,7 +216,9 @@ class Session : public gin::Wrappable<Session>,
// The client id to enable the network throttler. // The client id to enable the network throttler.
base::UnguessableToken network_emulation_token_; base::UnguessableToken network_emulation_token_;
raw_ptr<ElectronBrowserContext> browser_context_; const raw_ptr<ElectronBrowserContext> browser_context_;
base::WeakPtrFactory<Session> weak_factory_{this};
}; };
} // namespace api } // namespace api