From ed8ee5e2ac56173944213a0bf52141cbba20f5ff Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 5 Oct 2021 10:25:49 +0200
Subject: [PATCH] fix: crash on missing render frame

---
 shell/browser/api/electron_api_web_contents.cc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 3d5a971a91a84..e77fda17ccc9f 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1697,9 +1697,14 @@ void WebContents::MessageTo(int32_t web_contents_id,
     gin::Handle<WebFrameMain> web_frame_main =
         WebFrameMain::From(JavascriptEnvironment::GetIsolate(), frame);
 
-    int32_t sender_id = ID();
-    web_frame_main->GetRendererApi()->Message(false /* internal */, channel,
-                                              std::move(arguments), sender_id);
+    if (!web_frame_main->CheckRenderFrame())
+      return;
+
+    if () {
+      int32_t sender_id = ID();
+      web_frame_main->GetRendererApi()->Message(
+          false /* internal */, channel, std::move(arguments), sender_id);
+    }
   }
 }