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

fix: crash in WebFrameMain mojo connection when RenderFrameHost is nullptr (#34411)

Browse source 
* fix: crash when RenderFrameHost is nullptr

* chore: lint fix

Co-authored-by: samuelmaddock <samuel.maddock@gmail.com>
This commit is contained in:
Samuel Attard 2022-06-01 16:03:04 -07:00 • committed by GitHub
parent f306fbc010
commit 1cd07c565a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
shell/browser/api/electron_api_web_frame_main.cc
View file

@ -193,8 +193,13 @@ void WebFrameMain::MaybeSetupMojoConnection() {
renderer_api_.set_disconnect_handler(base::BindOnce( renderer_api_.set_disconnect_handler(base::BindOnce(
&WebFrameMain::OnRendererConnectionError, weak_factory_.GetWeakPtr())); &WebFrameMain::OnRendererConnectionError, weak_factory_.GetWeakPtr()));
} }
// Render frame should exist when this method is called.
DCHECK(render_frame_);
// Wait for RenderFrame to be created in renderer before accessing remote. // Wait for RenderFrame to be created in renderer before accessing remote.
if (pending_receiver_ && render_frame_->IsRenderFrameCreated()) { if (pending_receiver_ && render_frame_ &&
render_frame_->IsRenderFrameCreated()) {
render_frame_->GetRemoteInterfaces()->GetInterface( render_frame_->GetRemoteInterfaces()->GetInterface(
std::move(pending_receiver_)); std::move(pending_receiver_));
} }