Skip to content

Commit

Permalink
fix: crash in WebFrameMain mojo connection when RenderFrameHost is nu…
Browse files Browse the repository at this point in the history
…llptr (#34417)

* fix: crash when RenderFrameHost is nullptr

* chore: lint fix

Co-authored-by: samuelmaddock <samuel.maddock@gmail.com>
  • Loading branch information
trop[bot] and samuelmaddock committed Jun 2, 2022
1 parent 24df260 commit 73e3c29
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion shell/browser/api/electron_api_web_frame_main.cc
Expand Up @@ -193,8 +193,13 @@ void WebFrameMain::MaybeSetupMojoConnection() {
renderer_api_.set_disconnect_handler(base::BindOnce(
&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.
if (pending_receiver_ && render_frame_->IsRenderFrameCreated()) {
if (pending_receiver_ && render_frame_ &&
render_frame_->IsRenderFrameCreated()) {
render_frame_->GetRemoteInterfaces()->GetInterface(
std::move(pending_receiver_));
}
Expand Down

0 comments on commit 73e3c29

Please sign in to comment.