Access ChromotingHost::clients_ only on network thread.

remoting/host/client_session.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/client_session.h"
 
 #include <algorithm>
 
 #include "base/message_loop_proxy.h"
 #include "base/task.h"
@@ skipping 83 matching lines @@
   DCHECK_EQ(connection_.get(), connection);
   authenticated_ = true;
   event_handler_->OnSessionAuthenticated(this);
 }
 
 void ClientSession::OnConnectionClosed(
     protocol::ConnectionToClient* connection) {
   DCHECK_EQ(connection_.get(), connection);
   scoped_refptr<ClientSession> self = this;
   event_handler_->OnSessionClosed(this);
-  Disconnect();
 }
 
 void ClientSession::OnConnectionFailed(
     protocol::ConnectionToClient* connection) {
   DCHECK_EQ(connection_.get(), connection);
   // TODO(sergeyu): Log failure reason?
   scoped_refptr<ClientSession> self = this;
   event_handler_->OnSessionClosed(this);
-  Disconnect();
 }
 
 void ClientSession::OnSequenceNumberUpdated(
     protocol::ConnectionToClient* connection, int64 sequence_number) {
   DCHECK_EQ(connection_.get(), connection);
   event_handler_->OnSessionSequenceNumber(this, sequence_number);
 }
 
 void ClientSession::Disconnect() {
-  connection_->Disconnect();
+  DCHECK(connection_);
   authenticated_ = false;
   RestoreEventState();
+
+  // This triggers OnSessionClosed() and the session may be destroyed
+  // as the result, so this call must be the last in this method.
+  connection_->Disconnect();
 }
 
 void ClientSession::LocalMouseMoved(const SkIPoint& mouse_pos) {
   // If this is a genuine local input event (rather than an echo of a remote
   // input event that we've just injected), then ignore remote inputs for a
   // short time.
   std::list<SkIPoint>::iterator found_position =
       std::find(injected_mouse_positions_.begin(),
                 injected_mouse_positions_.end(), mouse_pos);
   if (found_position != injected_mouse_positions_.end()) {
@@ skipping 84 matching lines @@
       mouse.set_y(remote_mouse_pos_.y());
       mouse.set_button((MouseEvent::MouseButton)i);
       mouse.set_button_down(false);
       input_stub_->InjectMouseEvent(mouse);
     }
   }
   remote_mouse_button_state_ = 0;
 }
 
 }  // namespace remoting