summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 01:48:16 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 01:48:16 +0000
commit2285e5544fb729014dcc37f8c9f870cc1a88ddf9 (patch)
treea55ada4faacc2b7a78eb0c2f64ffa6f9e10b32d5 /net
parent33eeba7b945a265e14f438e277dc25ccd9f3c7d8 (diff)
downloadchromium_src-2285e5544fb729014dcc37f8c9f870cc1a88ddf9.zip
chromium_src-2285e5544fb729014dcc37f8c9f870cc1a88ddf9.tar.gz
chromium_src-2285e5544fb729014dcc37f8c9f870cc1a88ddf9.tar.bz2
Add a NULL check to SpdyHttpStream::GetLoadTimingInfo, to
hopefully fix a crasher. BUG=174368 Review URL: https://codereview.chromium.org/12230003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/spdy/spdy_http_stream.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index b49b9f7..ac4a3bf 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -190,7 +190,7 @@ bool SpdyHttpStream::GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const {
// The reused flag can only be correctly set once a stream has an ID. Streams
// get their IDs once the request has been successfully sent, so this does not
// behave that differently from other stream types.
- if (!stream_ || stream_->stream_id() == 0)
+ if (!spdy_session_ || !stream_ || stream_->stream_id() == 0)
return false;
return spdy_session_->GetLoadTimingInfo(stream_->stream_id(),
load_timing_info);