diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 06:01:21 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 06:01:21 +0000 |
| commit | 3ae823083442061c26aa61c72385c3e085fe2fe6 (patch) | |
| tree | 4cb16dea043374ae181f23b850cc976cfcca1cb3 /net/socket/client_socket_pool_base.cc | |
| parent | ea376ac69fd89cf237693834326acca685e7a22d (diff) | |
| download | chromium_src-3ae823083442061c26aa61c72385c3e085fe2fe6.zip chromium_src-3ae823083442061c26aa61c72385c3e085fe2fe6.tar.gz chromium_src-3ae823083442061c26aa61c72385c3e085fe2fe6.tar.bz2 | |
Reset internal ClientSocketHandle state on Init() synchronous error (failure to do so could lead to a crash). Also delete a CHECK that was asserting on possibly deleted memory.
BUG=http://crbug.com/15207
TEST=See bug for repro.
Review URL: http://codereview.chromium.org/147155
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_base.cc')
| -rw-r--r-- | net/socket/client_socket_pool_base.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc index a67e9c9..4a2770f 100644 --- a/net/socket/client_socket_pool_base.cc +++ b/net/socket/client_socket_pool_base.cc @@ -111,10 +111,7 @@ int ClientSocketPoolBase::RequestSocket( ConnectJob* connect_job = connect_job_factory_->NewConnectJob(group_name, r, this); connect_job_map_[handle] = connect_job; - int rv = connect_job->Connect(); - - CheckSocketCounts(group); - return rv; + return connect_job->Connect(); } void ClientSocketPoolBase::CancelRequest(const std::string& group_name, |