diff options
| author | elijahtaylor@google.com <elijahtaylor@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 22:43:00 +0000 |
|---|---|---|
| committer | elijahtaylor@google.com <elijahtaylor@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 22:43:00 +0000 |
| commit | 45731e3cf5381b461ea7a72b3d63ff28a26ff64b (patch) | |
| tree | 4fbb7a628f32dcbee4e0bc5c0128a6cc026c44ce /content/browser | |
| parent | afd6c68d9fadbbcc281525c0b4f8d48736b13cae (diff) | |
| download | chromium_src-45731e3cf5381b461ea7a72b3d63ff28a26ff64b.zip chromium_src-45731e3cf5381b461ea7a72b3d63ff28a26ff64b.tar.gz chromium_src-45731e3cf5381b461ea7a72b3d63ff28a26ff64b.tar.bz2 | |
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
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/browser_child_process_host.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; |