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

fix: crash when invoking login callback synchronously (#30068)

Browse source
This commit is contained in:
Jeremy Rose 2021-07-12 12:33:41 -07:00 • committed by GitHub
parent 0cb5631b0b
commit e26901aba4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/login_handler.cc
View file

@ -66,11 +66,15 @@ void LoginHandler::EmitEvent(
details.Set("firstAuthAttempt", first_auth_attempt); details.Set("firstAuthAttempt", first_auth_attempt);
details.Set("responseHeaders", response_headers.get()); details.Set("responseHeaders", response_headers.get());
auto weak_this = weak_factory_.GetWeakPtr();
bool default_prevented = bool default_prevented =
api_web_contents->Emit("login", std::move(details), auth_info, api_web_contents->Emit("login", std::move(details), auth_info,
base::BindOnce(&LoginHandler::CallbackFromJS, base::BindOnce(&LoginHandler::CallbackFromJS,
weak_factory_.GetWeakPtr())); weak_factory_.GetWeakPtr()));
if (!default_prevented && auth_required_callback_) { // ⚠️ NB, if CallbackFromJS is called during Emit(), |this| will have been
// deleted. Check the weak ptr before accessing any member variables to
// prevent UAF.
if (weak_this && !default_prevented && auth_required_callback_) {
std::move(auth_required_callback_).Run(absl::nullopt); std::move(auth_required_callback_).Run(absl::nullopt);
} }
} }