commit 3c819f52648d751ebe29ee2add8f79f6b41fc4d7
author willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Dec 02 02:03:12 2010
committer willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Dec 02 02:03:12 2010
tree 335275c6d1543eaddc8f9100143036464dd604fd
parent 98228e2cb88a610a95174473cebe937beadcb82a

Fix ClientSocketPoolBaseHelper preconnect crasher.

It's caused by an invalid read that sometimes leads to an invalid write that causes a CHECK failure.

BUG=64985
TEST=New unit test added, fails under valgrind without the fix.

Review URL: http://codereview.chromium.org/5523001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67942 0039d316-1c4b-4281-b951-d872f2087c98

net/socket/client_socket_pool_base_unittest.cc

diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index fd9e3372..fef0a5e 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -2916,6 +2916,16 @@
   EXPECT_EQ(kDefaultMaxSocketsPerGroup, pool_->IdleSocketCountInGroup("b"));
 }
 
+TEST_F(ClientSocketPoolBaseTest, RequestSocketsSynchronousError) {
+  CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup);
+  connect_job_factory_->set_job_type(TestConnectJob::kMockFailingJob);
+
+  pool_->RequestSockets("a", &params_, kDefaultMaxSocketsPerGroup,
+                        BoundNetLog());
+
+  ASSERT_FALSE(pool_->HasGroup("a"));
+}
+
 TEST_F(ClientSocketPoolBaseTest, RequestSocketsMultipleTimesDoesNothing) {
   CreatePool(4, 4);
   connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob);