Cancel any outstanding host resolve when calling SOCKSClientSocket::Disconnec...

net/socket/socks_client_socket.cc

 // Copyright (c) 2009 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 "net/socket/socks_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/trace_event.h"
 #include "net/base/io_buffer.h"
@@ skipping 89 matching lines @@
     user_callback_ = callback;
   } else {
     LoadLog::EndEvent(load_log, LoadLog::TYPE_SOCKS_CONNECT);
     load_log_ = NULL;
   }
   return rv;
 }
 
 void SOCKSClientSocket::Disconnect() {
   completed_handshake_ = false;
+  host_resolver_.Cancel();
   transport_->Disconnect();
+
+  // Reset other states to make sure they aren't mistakenly used later.
+  // These are the states initialized by Connect().
+  next_state_ = STATE_NONE;
+  user_callback_ = NULL;
+  load_log_ = NULL;
 }
 
 bool SOCKSClientSocket::IsConnected() const {
   return completed_handshake_ && transport_->IsConnected();
 }
 
 bool SOCKSClientSocket::IsConnectedAndIdle() const {
   return completed_handshake_ && transport_->IsConnectedAndIdle();
 }
 
@@ skipping 270 matching lines @@
 }
 
 #if defined(OS_LINUX)
 int SOCKSClientSocket::GetPeerName(struct sockaddr* name,
                                    socklen_t* namelen) {
   return transport_->GetPeerName(name, namelen);
 }
 #endif
 
 }  // namespace net