summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 11:11:20 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 11:11:20 +0000
commit2ab5be46a52588cc0bd69bdd89de693bbac96f92 (patch)
treea2c088ba9cd394a1f764cf923e1ed51805f7ea1a /net
parent5fd07f380ad47219ab66afb7cf4ae7e1a3209369 (diff)
downloadchromium_src-2ab5be46a52588cc0bd69bdd89de693bbac96f92.zip
chromium_src-2ab5be46a52588cc0bd69bdd89de693bbac96f92.tar.gz
chromium_src-2ab5be46a52588cc0bd69bdd89de693bbac96f92.tar.bz2
Fix crash in DeleteStream.
BUG=none TEST=none Review URL: http://codereview.chromium.org/2860004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/spdy/spdy_session.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 7fdd395..f69710c 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -876,9 +876,10 @@ void SpdySession::DeleteStream(spdy::SpdyStreamId id, int status) {
}
}
- // The stream should still exist.
+ // The stream might have been deleted.
ActiveStreamMap::iterator it2 = active_streams_.find(id);
- DCHECK(it2 != active_streams_.end());
+ if (it2 == active_streams_.end())
+ return;
// If this is an active stream, call the callback.
const scoped_refptr<SpdyStream>& stream = it2->second;