From 45731e3cf5381b461ea7a72b3d63ff28a26ff64b Mon Sep 17 00:00:00 2001 From: "elijahtaylor@google.com" Date: Fri, 15 Jul 2011 22:43:00 +0000 Subject: Check the child_process_ ptr before access on shutdown, is causing browser crash in NaCl Win64. BUG= http://code.google.com/p/nativeclient/issues/detail?id=2018 TEST= manual win64 nacl, trybots for chrome Review URL: http://codereview.chromium.org/7388021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92763 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/browser_child_process_host.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'content/browser') diff --git a/content/browser/browser_child_process_host.cc b/content/browser/browser_child_process_host.cc index d38f5d7..7beb07a 100644 --- a/content/browser/browser_child_process_host.cc +++ b/content/browser/browser_child_process_host.cc @@ -127,7 +127,7 @@ void BrowserChildProcessHost::OnChildDied() { // This may be called by both the channel's OnChannelError handler // as well as the process launcher's OnProcessLaunched handler, so // we need to be careful about the state of the process launcher here. - if (!child_process_->IsStarting()) + if (child_process_.get() && !child_process_->IsStarting()) set_handle(child_process_->GetHandle()); if (handle() != base::kNullProcessHandle) { int exit_code; -- cgit v1.1