From 28093a4d2d6b3eae728a1764f21fcdc8cb3db63e Mon Sep 17 00:00:00 2001
From: Haojian Wu <hokein.wu@gmail.com>
Date: Thu, 6 Aug 2015 15:03:04 +0800
Subject: [PATCH] Fix a crash issue in GetProcessOwner if no renderer view host
 is found.

---
 atom/browser/atom_browser_client.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc
index 65fd7cd031..9a3ad00fa4 100644
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -58,11 +58,15 @@ enum ProcessOwner {
   OWNER_GUEST_WEB_CONTENTS,
   OWNER_NONE,  // it might be devtools though.
 };
+
 ProcessOwner GetProcessOwner(int process_id,
                              NativeWindow** window,
                              WebViewManager::WebViewInfo* info) {
-  auto web_contents = content::WebContents::FromRenderViewHost(
-      content::RenderViewHost::FromID(process_id, kDefaultRoutingID));
+  content::RenderViewHost* rvh = content::RenderViewHost::FromID(
+      process_id, kDefaultRoutingID);
+  if (!rvh)
+    return OWNER_NONE;
+  auto web_contents = content::WebContents::FromRenderViewHost(rvh);
   if (!web_contents)
     return OWNER_NONE;