summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authorcraig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-22 04:25:18 +0000
committercraig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-22 04:25:18 +0000
commit8910e310da144950b320f152a73856935b5e0175 (patch)
tree016b65d2f12757a1fdefd1c3bf7a0654cee48e79 /net/websockets
parentfcb7fd9e3fb31998c9055c63a6b99024e97f211e (diff)
downloadchromium_src-8910e310da144950b320f152a73856935b5e0175.zip
chromium_src-8910e310da144950b320f152a73856935b5e0175.tar.gz
chromium_src-8910e310da144950b320f152a73856935b5e0175.tar.bz2
Fix calculation of length in websocket.cc.
The compiler warned about this. See http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-49#section-4.2 for how to calculate the length. Review URL: http://codereview.chromium.org/293055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/websockets/websocket.cc b/net/websockets/websocket.cc
index 4fa0bfd..9b2b142 100644
--- a/net/websockets/websocket.cc
+++ b/net/websockets/websocket.cc
@@ -380,7 +380,7 @@ void WebSocket::ProcessFrameData() {
socket_stream_->Close();
return;
}
- length = length * 128 + *p & 0x7f;
+ length = length * 128 + (*p & 0x7f);
++p;
}
// Checks if the frame body hasn't been completely received yet.