diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 04:23:29 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 04:23:29 +0000 |
| commit | 6b302a8670e0562c7196c5438bacfc57b6937816 (patch) | |
| tree | efba0c6e3488720cb1a3b9a1f2edd56eb056b9cc /remoting/protocol | |
| parent | 4115f132109572ff1578f956d8a0a36e0c8f9af0 (diff) | |
| download | chromium_src-6b302a8670e0562c7196c5438bacfc57b6937816.zip chromium_src-6b302a8670e0562c7196c5438bacfc57b6937816.tar.gz chromium_src-6b302a8670e0562c7196c5438bacfc57b6937816.tar.bz2 | |
Fix crash condition if caller deletes PseudoTcpAdaptor from within a callback.
BUG=82171
TEST=
Review URL: http://codereview.chromium.org/7040021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/jingle_session.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc index 60fab26..90aaf08 100644 --- a/remoting/protocol/jingle_session.cc +++ b/remoting/protocol/jingle_session.cc @@ -381,6 +381,8 @@ bool JingleSession::EstablishSSLConnection( new jingle_glue::PseudoTcpAdapter(channel); pseudotcp->Connect(&connect_callback_); + // TODO(wez): We shouldn't try to start SSL until the socket we're + // starting it on is connected. if (cricket_session_->initiator()) { // Create client SSL socket. net::SSLClientSocket* socket = CreateSSLClientSocket( |