fix: potential crash when rfh is disposed

electron · May 17, 2022 · 48b03f3 · 48b03f3
1 parent 8121ffd
commit 48b03f3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
@@ -103,6 +103,7 @@ void WebFrameMain::UpdateRenderFrameHost(content::RenderFrameHost* rfh) {
   render_frame_disposed_ = false;
   render_frame_ = rfh;
   renderer_api_.reset();
+  pending_receiver_.reset();
   MaybeSetupMojoConnection();
 }
 
@@ -193,7 +194,7 @@ void WebFrameMain::MaybeSetupMojoConnection() {
         &WebFrameMain::OnRendererConnectionError, weak_factory_.GetWeakPtr()));
   }
   // Wait for RenderFrame to be created in renderer before accessing remote.
-  if (pending_receiver_ && render_frame_->IsRenderFrameCreated()) {
+  if (pending_receiver_ && !render_frame_disposed_ && render_frame_->IsRenderFrameCreated()) {
     render_frame_->GetRemoteInterfaces()->GetInterface(
         std::move(pending_receiver_));
   }