diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 20:18:50 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 20:18:50 +0000 |
| commit | 74188f235dd5b4f8e80ca30d6e3a4d4c3061d84d (patch) | |
| tree | b27e432a39963d7738c1464001158d2b905c6fc4 /net/spdy/spdy_framer.cc | |
| parent | 6c86698860a88d07b21da6efdaf41ceb8273ccb1 (diff) | |
| download | chromium_src-74188f235dd5b4f8e80ca30d6e3a4d4c3061d84d.zip chromium_src-74188f235dd5b4f8e80ca30d6e3a4d4c3061d84d.tar.gz chromium_src-74188f235dd5b4f8e80ca30d6e3a4d4c3061d84d.tar.bz2 | |
Take 2 at landing the SPDY SETTINGS frame patch.
BUG=34749
TEST=SpdyNetworkTransactionTest.Setting*
Review URL: http://codereview.chromium.org/1547028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_framer.cc')
| -rw-r--r-- | net/spdy/spdy_framer.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc index 864a0d9..65ef2e5 100644 --- a/net/spdy/spdy_framer.cc +++ b/net/spdy/spdy_framer.cc @@ -298,6 +298,11 @@ void SpdyFramer::ProcessControlFrameHeader() { SpdyGoAwayControlFrame::size() - SpdyFrame::size()) set_error(SPDY_INVALID_CONTROL_FRAME); break; + case SETTINGS: + if (current_control_frame.length() < + SpdySettingsControlFrame::size() - SpdyControlFrame::size()) + set_error(SPDY_INVALID_CONTROL_FRAME); + break; default: LOG(WARNING) << "Valid spdy control frame with unknown type: " << current_control_frame.type(); |