summaryrefslogtreecommitdiffstats
path: root/net/socket/client_socket_pool_base.h
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/client_socket_pool_base.h
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/client_socket_pool_base.h')
-rw-r--r--net/socket/client_socket_pool_base.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h
index 91289d8..89bdb78 100644
--- a/net/socket/client_socket_pool_base.h
+++ b/net/socket/client_socket_pool_base.h
@@ -408,6 +408,9 @@ class ClientSocketPoolBaseHelper
// Number of connected sockets we handed out across all groups.
int handed_out_socket_count_;
+ // Number of sockets being released.
+ int num_releasing_sockets_;
+
// The maximum total number of sockets. See ReachedMaxSocketsLimit.
const int max_sockets_;