Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Side by Side Diff: content/browser/browser_child_process_host_impl.cc

Issue 2054303002: Kill child processes on bad Mojo messages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bad-message
Patch Set: . Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/browser_child_process_host_impl.h" 5 #include "content/browser/browser_child_process_host_impl.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/dump_without_crashing.h" 10 #include "base/debug/dump_without_crashing.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches, 234 cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches,
235 arraysize(kForwardSwitches)); 235 arraysize(kForwardSwitches));
236 236
237 notify_child_disconnected_ = true; 237 notify_child_disconnected_ = true;
238 child_process_.reset(new ChildProcessLauncher( 238 child_process_.reset(new ChildProcessLauncher(
239 delegate, 239 delegate,
240 cmd_line, 240 cmd_line,
241 data_.id, 241 data_.id,
242 this, 242 this,
243 mojo_child_token_, 243 mojo_child_token_,
244 mojo::edk::ProcessErrorCallback(),
jam 2016/06/13 18:30:39 why not do it here as well? in general we try to
Ken Rockot(use gerrit already) 2016/06/13 22:36:40 done
jam 2016/06/13 23:27:12 nit: please update cl desc & title
244 terminate_on_shutdown)); 245 terminate_on_shutdown));
245 } 246 }
246 247
247 const ChildProcessData& BrowserChildProcessHostImpl::GetData() const { 248 const ChildProcessData& BrowserChildProcessHostImpl::GetData() const {
248 DCHECK_CURRENTLY_ON(BrowserThread::IO); 249 DCHECK_CURRENTLY_ON(BrowserThread::IO);
249 return data_; 250 return data_;
250 } 251 }
251 252
252 ChildProcessHost* BrowserChildProcessHostImpl::GetHost() const { 253 ChildProcessHost* BrowserChildProcessHostImpl::GetHost() const {
253 DCHECK_CURRENTLY_ON(BrowserThread::IO); 254 DCHECK_CURRENTLY_ON(BrowserThread::IO);
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 472
472 #if defined(OS_WIN) 473 #if defined(OS_WIN)
473 474
474 void BrowserChildProcessHostImpl::OnObjectSignaled(HANDLE object) { 475 void BrowserChildProcessHostImpl::OnObjectSignaled(HANDLE object) {
475 OnChildDisconnected(); 476 OnChildDisconnected();
476 } 477 }
477 478
478 #endif 479 #endif
479 480
480 } // namespace content 481 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698