summaryrefslogtreecommitdiffstats
path: root/net/socket/tcp_client_socket_pool_unittest.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-10 18:58:54 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-10 18:58:54 +0000
commitd7027bb306959b525be5fb1af7d4d841e2ef2bae (patch)
tree2ac19c6b9e72ceddc5ef53527491886f2ae4cba7 /net/socket/tcp_client_socket_pool_unittest.cc
parente36f82b42eac795bd7fd0ed22592976845a3fb8a (diff)
downloadchromium_src-d7027bb306959b525be5fb1af7d4d841e2ef2bae.zip
chromium_src-d7027bb306959b525be5fb1af7d4d841e2ef2bae.tar.gz
chromium_src-d7027bb306959b525be5fb1af7d4d841e2ef2bae.tar.bz2
Reland 46757.
OnAvailableSocketSlot() was dereferencing a NULL pointer. Add a NULL check. Add a test. BUG=42267 Review URL: http://codereview.chromium.org/2050005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/tcp_client_socket_pool_unittest.cc')
-rw-r--r--net/socket/tcp_client_socket_pool_unittest.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/socket/tcp_client_socket_pool_unittest.cc b/net/socket/tcp_client_socket_pool_unittest.cc
index 6df566ba..cba12b5 100644
--- a/net/socket/tcp_client_socket_pool_unittest.cc
+++ b/net/socket/tcp_client_socket_pool_unittest.cc
@@ -731,6 +731,13 @@ TEST_F(TCPClientSocketPoolTest, BackupSocketConnect) {
// One socket is stalled, the other is active.
EXPECT_EQ(0, pool_->IdleSocketCount());
handle.Reset();
+
+ pool_ = new TCPClientSocketPool(kMaxSockets,
+ kMaxSocketsPerGroup,
+ "TCPUnitTest",
+ host_resolver_,
+ &client_socket_factory_,
+ NULL);
}
}