fix: check for validity of guest webcontents (#21035)

electron · Nov 7, 2019 · dc97938 · dc97938
1 parent bcabc25
commit dc97938
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/shell/browser/web_view_manager.cc b/shell/browser/web_view_manager.cc
@@ -62,10 +62,14 @@ content::WebContents* WebViewManager::GetGuestByInstanceID(
 
 bool WebViewManager::ForEachGuest(content::WebContents* embedder_web_contents,
                                   const GuestCallback& callback) {
-  for (auto& item : web_contents_embedder_map_)
-    if (item.second.embedder == embedder_web_contents &&
-        callback.Run(item.second.web_contents))
+  for (auto& item : web_contents_embedder_map_) {
+    if (item.second.embedder != embedder_web_contents)
+      continue;
+
+    auto* guest_web_contents = item.second.web_contents;
+    if (guest_web_contents && callback.Run(guest_web_contents))
       return true;
+  }
   return false;
 }