summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_session.cc
diff options
context:
space:
mode:
authorbengr@google.com <bengr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-27 18:12:50 +0000
committerbengr@google.com <bengr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-27 18:12:50 +0000
commit61b4efcd2a24ed3862775093626247ebddc3f5f0 (patch)
treefd68ca0ecbeaa57986b44f2c1acf2e27fbf44c94 /net/http/http_network_session.cc
parentc8e9110081b2fbde9954c3e88285826afce13d9f (diff)
downloadchromium_src-61b4efcd2a24ed3862775093626247ebddc3f5f0.zip
chromium_src-61b4efcd2a24ed3862775093626247ebddc3f5f0.tar.gz
chromium_src-61b4efcd2a24ed3862775093626247ebddc3f5f0.tar.bz2
Fixed unsafe passing of command-line parameter to SpdySession
The value of --trusted-spdy-proxy (formerly --allow-spdy-proxy-push-across-origins) is now being passed to a SpdySession via HttpNetworkSession::Params. This fixes unsafe memory handling in which a stack-allocated value was being stored in a global char* in spdy_session.cc. BUG= TEST= Review URL: http://codereview.chromium.org/10169033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_session.cc')
-rw-r--r--net/http/http_network_session.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index f5cc7b1..c40061b9 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -63,7 +63,8 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
CreateSocketPoolManager(WEBSOCKET_SOCKET_POOL, params)),
spdy_session_pool_(params.host_resolver,
params.ssl_config_service,
- params.http_server_properties),
+ params.http_server_properties,
+ params.trusted_spdy_proxy),
ALLOW_THIS_IN_INITIALIZER_LIST(http_stream_factory_(
new HttpStreamFactoryImpl(this))),
params_(params) {