summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 23:13:38 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 23:13:38 +0000
commit405424ed1c0e66dbe7b2eefb33557b8d70dab601 (patch)
tree3568bdabb54395a9705753e43ef3980db1a1fa7e /jingle
parentc064cc59c835d87a2c6bd3a29d64d56f600e3212 (diff)
downloadchromium_src-405424ed1c0e66dbe7b2eefb33557b8d70dab601.zip
chromium_src-405424ed1c0e66dbe7b2eefb33557b8d70dab601.tar.gz
chromium_src-405424ed1c0e66dbe7b2eefb33557b8d70dab601.tar.bz2
Fixing a crash when cancelling the same PacRequest twice.
BUG=140096 Review URL: https://chromiumcodereview.appspot.com/10882038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/glue/proxy_resolving_client_socket.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc
index 479a781..02df488 100644
--- a/jingle/glue/proxy_resolving_client_socket.cc
+++ b/jingle/glue/proxy_resolving_client_socket.cc
@@ -286,8 +286,10 @@ void ProxyResolvingClientSocket::ReportSuccessfulProxyConnection() {
void ProxyResolvingClientSocket::Disconnect() {
CloseTransportSocket();
- if (pac_request_)
+ if (pac_request_) {
network_session_->proxy_service()->CancelPacRequest(pac_request_);
+ pac_request_ = NULL;
+ }
user_connect_callback_.Reset();
}